Add support for LDFLAGS when building xentools{42,45,46,48}
This helps pass the RELRO check for these packages.
(khorben)
diff -r1.61 -r1.62 pkgsrc/sysutils/xentools42/Makefile| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.61 2017/09/08 09:51:25 jaapb Exp $ | 1 | # $NetBSD: Makefile,v 1.62 2017/10/28 01:46:11 khorben Exp $ | |
| 2 | 2 | |||
| 3 | VERSION= 4.2.5 | 3 | VERSION= 4.2.5 | |
| 4 | VERSION_IPXE= 1.0.0 | 4 | VERSION_IPXE= 1.0.0 | |
| 5 | 5 | |||
| 6 | DISTNAME= xen-${VERSION} | 6 | DISTNAME= xen-${VERSION} | |
| 7 | PKGNAME= xentools42-${VERSION} | 7 | PKGNAME= xentools42-${VERSION} | |
| 8 | PKGREVISION= 25 | 8 | PKGREVISION= 25 | |
| 9 | CATEGORIES= sysutils | 9 | CATEGORIES= sysutils | |
| 10 | MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ | 10 | MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ | |
| 11 | 11 | |||
| 12 | DISTFILES= ${DISTNAME}.tar.gz | 12 | DISTFILES= ${DISTNAME}.tar.gz | |
| 13 | DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz | 13 | DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz | |
| 14 | SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | 14 | SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | |
| @@ -44,26 +44,27 @@ CHECK_PORTABILITY_SKIP= examples/* | @@ -44,26 +44,27 @@ CHECK_PORTABILITY_SKIP= examples/* | |||
| 44 | 44 | |||
| 45 | EGDIR= ${PREFIX}/share/examples/xen | 45 | EGDIR= ${PREFIX}/share/examples/xen | |
| 46 | MESSAGE_SUBST+= EGDIR=${EGDIR} | 46 | MESSAGE_SUBST+= EGDIR=${EGDIR} | |
| 47 | 47 | |||
| 48 | USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash | 48 | USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash | |
| 49 | 49 | |||
| 50 | GNU_CONFIGURE= YES | 50 | GNU_CONFIGURE= YES | |
| 51 | #CONFIGURE_ARGS+= --enable-xenapi | 51 | #CONFIGURE_ARGS+= --enable-xenapi | |
| 52 | CONFIGURE_ARGS+= --disable-seabios | 52 | CONFIGURE_ARGS+= --disable-seabios | |
| 53 | 53 | |||
| 54 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | 54 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | |
| 55 | 55 | |||
| 56 | MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} | 56 | MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} | |
| 57 | MAKE_ENV+= APPEND_LIB=${LDFLAGS:Q} | |||
| 57 | MAKE_ENV+= EGDIR=${EGDIR} | 58 | MAKE_ENV+= EGDIR=${EGDIR} | |
| 58 | MAKE_ENV+= BASH_COMPLETION_DIR=${EGDIR} | 59 | MAKE_ENV+= BASH_COMPLETION_DIR=${EGDIR} | |
| 59 | MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} | 60 | MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} | |
| 60 | MAKE_ENV+= VARBASE=${VARBASE} | 61 | MAKE_ENV+= VARBASE=${VARBASE} | |
| 61 | MAKE_ENV+= V=YES | 62 | MAKE_ENV+= V=YES | |
| 62 | MAKE_ENV+= NO_WERROR=1 | 63 | MAKE_ENV+= NO_WERROR=1 | |
| 63 | 64 | |||
| 64 | #MAKE_ENV+= INSTALL_DIR=${BSD_INSTALL_DATA_DIR} | 65 | #MAKE_ENV+= INSTALL_DIR=${BSD_INSTALL_DATA_DIR} | |
| 65 | #MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA} | 66 | #MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA} | |
| 66 | #MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} | 67 | #MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} | |
| 67 | 68 | |||
| 68 | PY_PATCHPLIST= yes | 69 | PY_PATCHPLIST= yes | |
| 69 | #REPLACE_PYTHON+= misc/xm | 70 | #REPLACE_PYTHON+= misc/xm |
| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.52 2017/10/27 23:50:38 khorben Exp $ | 1 | # $NetBSD: Makefile,v 1.53 2017/10/28 01:46:11 khorben Exp $ | |
| 2 | 2 | |||
| 3 | VERSION= 4.5.5 | 3 | VERSION= 4.5.5 | |
| 4 | PKGREVISION= 7 | 4 | PKGREVISION= 7 | |
| 5 | VERSION_IPXE= 9a93db3f0947484e30e753bbd61a10b17336e20e | 5 | VERSION_IPXE= 9a93db3f0947484e30e753bbd61a10b17336e20e | |
| 6 | 6 | |||
| 7 | DISTNAME= xen-${VERSION} | 7 | DISTNAME= xen-${VERSION} | |
| 8 | PKGNAME= xentools45-${VERSION} | 8 | PKGNAME= xentools45-${VERSION} | |
| 9 | CATEGORIES= sysutils | 9 | CATEGORIES= sysutils | |
| 10 | MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ | 10 | MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ | |
| 11 | 11 | |||
| 12 | DISTFILES= ${DISTNAME}.tar.gz | 12 | DISTFILES= ${DISTNAME}.tar.gz | |
| 13 | DISTFILES+= ipxe-git-${VERSION_IPXE}.tar.gz | 13 | DISTFILES+= ipxe-git-${VERSION_IPXE}.tar.gz | |
| 14 | SITES.ipxe-git-${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | 14 | SITES.ipxe-git-${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | |
| @@ -42,26 +42,27 @@ CHECK_RELRO_SKIP= libexec/xen/boot/hvmlo | @@ -42,26 +42,27 @@ CHECK_RELRO_SKIP= libexec/xen/boot/hvmlo | |||
| 42 | 42 | |||
| 43 | EGDIR= ${PREFIX}/share/examples/xen | 43 | EGDIR= ${PREFIX}/share/examples/xen | |
| 44 | MESSAGE_SUBST+= EGDIR=${EGDIR} | 44 | MESSAGE_SUBST+= EGDIR=${EGDIR} | |
| 45 | 45 | |||
| 46 | USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash | 46 | USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash | |
| 47 | 47 | |||
| 48 | GNU_CONFIGURE= YES | 48 | GNU_CONFIGURE= YES | |
| 49 | #CONFIGURE_ARGS+= --enable-xenapi | 49 | #CONFIGURE_ARGS+= --enable-xenapi | |
| 50 | CONFIGURE_ARGS+= --disable-seabios | 50 | CONFIGURE_ARGS+= --disable-seabios | |
| 51 | 51 | |||
| 52 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | 52 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | |
| 53 | 53 | |||
| 54 | MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} | 54 | MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} | |
| 55 | MAKE_ENV+= APPEND_LIB=${LDFLAGS:Q} | |||
| 55 | MAKE_ENV+= XEN_EXAMPLES_DIR=${EGDIR} | 56 | MAKE_ENV+= XEN_EXAMPLES_DIR=${EGDIR} | |
| 56 | MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} | 57 | MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} | |
| 57 | MAKE_ENV+= V=YES | 58 | MAKE_ENV+= V=YES | |
| 58 | MAKE_ENV+= NO_WERROR=1 | 59 | MAKE_ENV+= NO_WERROR=1 | |
| 59 | 60 | |||
| 60 | #MAKE_ENV+= INSTALL_DIR=${BSD_INSTALL_DATA_DIR} | 61 | #MAKE_ENV+= INSTALL_DIR=${BSD_INSTALL_DATA_DIR} | |
| 61 | #MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA} | 62 | #MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA} | |
| 62 | #MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} | 63 | #MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} | |
| 63 | 64 | |||
| 64 | PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 | 65 | PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 | |
| 65 | 66 | |||
| 66 | PY_PATCHPLIST= yes | 67 | PY_PATCHPLIST= yes | |
| 67 | REPLACE_PYTHON+= misc/sbdf2devicepath misc/xen-bugtool | 68 | REPLACE_PYTHON+= misc/sbdf2devicepath misc/xen-bugtool |
| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.24 2017/10/27 23:50:38 khorben Exp $ | 1 | # $NetBSD: Makefile,v 1.25 2017/10/28 01:46:11 khorben Exp $ | |
| 2 | # | 2 | # | |
| 3 | # VERSION is set in version.mk as it is shared with other packages | 3 | # VERSION is set in version.mk as it is shared with other packages | |
| 4 | .include "version.mk" | 4 | .include "version.mk" | |
| 5 | 5 | |||
| 6 | DISTNAME= xen-${VERSION} | 6 | DISTNAME= xen-${VERSION} | |
| 7 | PKGNAME= xentools46-${VERSION} | 7 | PKGNAME= xentools46-${VERSION} | |
| 8 | PKGREVISION= 1 | 8 | PKGREVISION= 1 | |
| 9 | CATEGORIES= sysutils | 9 | CATEGORIES= sysutils | |
| 10 | MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ | 10 | MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ | |
| 11 | 11 | |||
| 12 | DISTFILES= ${DISTNAME}.tar.gz | 12 | DISTFILES= ${DISTNAME}.tar.gz | |
| 13 | DISTFILES+= ipxe-git-${VERSION_IPXE}.tar.gz | 13 | DISTFILES+= ipxe-git-${VERSION_IPXE}.tar.gz | |
| 14 | SITES.ipxe-git-${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | 14 | SITES.ipxe-git-${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | |
| @@ -43,26 +43,27 @@ CHECK_RELRO_SKIP= libexec/xen/boot/hvmlo | @@ -43,26 +43,27 @@ CHECK_RELRO_SKIP= libexec/xen/boot/hvmlo | |||
| 43 | EGDIR= ${PREFIX}/share/examples/xen | 43 | EGDIR= ${PREFIX}/share/examples/xen | |
| 44 | MESSAGE_SUBST+= EGDIR=${EGDIR} | 44 | MESSAGE_SUBST+= EGDIR=${EGDIR} | |
| 45 | 45 | |||
| 46 | USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash | 46 | USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash | |
| 47 | USE_LANGUAGES= c | 47 | USE_LANGUAGES= c | |
| 48 | 48 | |||
| 49 | GNU_CONFIGURE= YES | 49 | GNU_CONFIGURE= YES | |
| 50 | #CONFIGURE_ARGS+= --enable-xenapi | 50 | #CONFIGURE_ARGS+= --enable-xenapi | |
| 51 | CONFIGURE_ARGS+= --disable-seabios | 51 | CONFIGURE_ARGS+= --disable-seabios | |
| 52 | 52 | |||
| 53 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | 53 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | |
| 54 | 54 | |||
| 55 | MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} | 55 | MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} | |
| 56 | MAKE_ENV+= APPEND_LIB=${LDFLAGS:Q} | |||
| 56 | MAKE_ENV+= XEN_EXAMPLES_DIR=${EGDIR} | 57 | MAKE_ENV+= XEN_EXAMPLES_DIR=${EGDIR} | |
| 57 | MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} | 58 | MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} | |
| 58 | MAKE_ENV+= V=YES | 59 | MAKE_ENV+= V=YES | |
| 59 | MAKE_ENV+= NO_WERROR=1 | 60 | MAKE_ENV+= NO_WERROR=1 | |
| 60 | 61 | |||
| 61 | #MAKE_ENV+= INSTALL_DIR=${BSD_INSTALL_DATA_DIR} | 62 | #MAKE_ENV+= INSTALL_DIR=${BSD_INSTALL_DATA_DIR} | |
| 62 | #MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA} | 63 | #MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA} | |
| 63 | #MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} | 64 | #MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} | |
| 64 | 65 | |||
| 65 | PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 | 66 | PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 | |
| 66 | 67 | |||
| 67 | PY_PATCHPLIST= yes | 68 | PY_PATCHPLIST= yes | |
| 68 | REPLACE_PYTHON+= misc/xen-bugtool misc/xen-ringwatch misc/xencons | 69 | REPLACE_PYTHON+= misc/xen-bugtool misc/xen-ringwatch misc/xencons |
| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.11 2017/10/27 23:50:38 khorben Exp $ | 1 | # $NetBSD: Makefile,v 1.12 2017/10/28 01:46:11 khorben Exp $ | |
| 2 | # | 2 | # | |
| 3 | VERSION= 4.8.2 | 3 | VERSION= 4.8.2 | |
| 4 | VERSION_IPXE= 827dd1bfee67daa683935ce65316f7e0f057fe1c | 4 | VERSION_IPXE= 827dd1bfee67daa683935ce65316f7e0f057fe1c | |
| 5 | DIST_IPXE= ipxe-git-${VERSION_IPXE}.tar.gz | 5 | DIST_IPXE= ipxe-git-${VERSION_IPXE}.tar.gz | |
| 6 | DIST_NEWLIB= newlib-1.16.0.tar.gz | 6 | DIST_NEWLIB= newlib-1.16.0.tar.gz | |
| 7 | DIST_LWIP= lwip-1.3.0.tar.gz | 7 | DIST_LWIP= lwip-1.3.0.tar.gz | |
| 8 | DIST_GRUB= grub-0.97.tar.gz | 8 | DIST_GRUB= grub-0.97.tar.gz | |
| 9 | DIST_GMP= gmp-4.3.2.tar.bz2 | 9 | DIST_GMP= gmp-4.3.2.tar.bz2 | |
| 10 | DIST_OCAML= ocaml-3.11.0.tar.gz | 10 | DIST_OCAML= ocaml-3.11.0.tar.gz | |
| 11 | DIST_POLARSSL= polarssl-1.1.4-gpl.tgz | 11 | DIST_POLARSSL= polarssl-1.1.4-gpl.tgz | |
| 12 | DIST_TPMEMU= tpm_emulator-0.7.4.tar.gz | 12 | DIST_TPMEMU= tpm_emulator-0.7.4.tar.gz | |
| 13 | DIST_ZLIB= zlib-1.2.3.tar.gz | 13 | DIST_ZLIB= zlib-1.2.3.tar.gz | |
| 14 | DIST_LIBPCI= pciutils-2.2.9.tar.bz2 | 14 | DIST_LIBPCI= pciutils-2.2.9.tar.bz2 | |
| @@ -82,26 +82,27 @@ CHECK_RELRO_SKIP= libexec/xen/boot/hvmlo | @@ -82,26 +82,27 @@ CHECK_RELRO_SKIP= libexec/xen/boot/hvmlo | |||
| 82 | EGDIR= ${PREFIX}/share/examples/xen | 82 | EGDIR= ${PREFIX}/share/examples/xen | |
| 83 | MESSAGE_SUBST+= EGDIR=${EGDIR} | 83 | MESSAGE_SUBST+= EGDIR=${EGDIR} | |
| 84 | 84 | |||
| 85 | USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash cmake | 85 | USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash cmake | |
| 86 | USE_LANGUAGES= c | 86 | USE_LANGUAGES= c | |
| 87 | 87 | |||
| 88 | GNU_CONFIGURE= YES | 88 | GNU_CONFIGURE= YES | |
| 89 | #CONFIGURE_ARGS+= --enable-xenapi | 89 | #CONFIGURE_ARGS+= --enable-xenapi | |
| 90 | CONFIGURE_ARGS+= --disable-seabios | 90 | CONFIGURE_ARGS+= --disable-seabios | |
| 91 | 91 | |||
| 92 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | 92 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} | |
| 93 | 93 | |||
| 94 | MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} | 94 | MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} | |
| 95 | MAKE_ENV+= APPEND_LIB=${LDFLAGS:Q} | |||
| 95 | MAKE_ENV+= XEN_EXAMPLES_DIR=${EGDIR} | 96 | MAKE_ENV+= XEN_EXAMPLES_DIR=${EGDIR} | |
| 96 | MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} | 97 | MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} | |
| 97 | MAKE_ENV+= V=YES | 98 | MAKE_ENV+= V=YES | |
| 98 | MAKE_ENV+= NO_WERROR=1 | 99 | MAKE_ENV+= NO_WERROR=1 | |
| 99 | 100 | |||
| 100 | PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 | 101 | PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 | |
| 101 | 102 | |||
| 102 | PY_PATCHPLIST= yes | 103 | PY_PATCHPLIST= yes | |
| 103 | REPLACE_PYTHON+= tools/misc/xen-bugtool tools/misc/xen-ringwatch | 104 | REPLACE_PYTHON+= tools/misc/xen-bugtool tools/misc/xen-ringwatch | |
| 104 | REPLACE_PYTHON+= tools/misc/xencons | 105 | REPLACE_PYTHON+= tools/misc/xencons | |
| 105 | REPLACE_PYTHON+= tools/misc/xenpvnetboot tools/misc/xensymoops | 106 | REPLACE_PYTHON+= tools/misc/xenpvnetboot tools/misc/xensymoops | |
| 106 | REPLACE_PYTHON+= tools/python/scripts/convert-legacy-stream | 107 | REPLACE_PYTHON+= tools/python/scripts/convert-legacy-stream | |
| 107 | REPLACE_PYTHON+= tools/python/scripts/verify-stream-v2 | 108 | REPLACE_PYTHON+= tools/python/scripts/verify-stream-v2 |