[patch] syslinux-6.04_pre3.ebuild.patch

syslinux-6.04_pre3.ebuild.patch (text/plain), 2.16 KB, created by Denis Kaganovich on 2019-04-02 09:29:08 UTC

--- /usr/portage/sys-boot/syslinux/syslinux-6.04_pre1.ebuild	2019-03-10 16:09:40.000000000 +0300
+++ syslinux-6.04_pre3.ebuild	2019-04-02 12:25:35.526517731 +0300
@@ -15,7 +15,9 @@ SRC_URI_TESTING=Testing/${PV:0:4}
 [[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
+SRC_URI="https://www.zytor.com/pub/${PN}/${SRC_URI_DIR}/${P/_/-}.tar.xz
+	mirror://kernel/linux/utils/boot/${PN}/${SRC_URI_DIR}/${P/_/-}.tar.xz
+	http://deb.debian.org/debian/pool/main/s/syslinux/syslinux_6.04~git20190206.bf6db5b4+dfsg1-1~bpo9+1.debian.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -44,7 +46,8 @@ QA_PREBUILT="usr/share/${PN}/*.c32"
 src_prepare() {
 	rm -f gethostip #bug 137081
 
-	epatch "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
+	rm */core efi*/lib -Rf
+	epatch "${WORKDIR}"/debian/patches/{0005,0016,0017,0018}-*.patch
 
 	# Don't prestrip or override user LDFLAGS, bug #305783
 	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
@@ -66,11 +69,6 @@ src_prepare() {
 			/usr/bin/syslinux
 			"
 	fi
-	case ${ARCH} in
-		amd64)	loaderarch="efi64" ;;
-		x86)	loaderarch="efi32" ;;
-		*)	ewarn "Unsupported architecture, building installers only." ;;
-	esac
 
 	# building with ld.gold causes problems, bug #563364
 	if tc-ld-is-gold; then
@@ -86,19 +84,20 @@ src_prepare() {
 	epatch_user
 }
 
-src_compile() {
+# keep variable identical everywere
+_make(){
 	# build system abuses the LDFLAGS variable to pass arguments to ld
 	unset LDFLAGS
-	if [[ ! -z ${loaderarch} ]]; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch}
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man "${@}"
+}
+
+src_compile() {
+	_make
 }
 
 src_install() {
 	# parallel install fails sometimes
-	einfo "loaderarch=${loaderarch}"
-	emake -j1 LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
+	_make -j1 install
 	dodoc README NEWS doc/*.txt
 }