From c691fa7bcb3149db0e6dcebd95b9757cb8fa962a Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Sat, 29 Feb 2020 17:28:14 +0100 Subject: [PATCH] compat32*: fix build and installation of most of these. --- compat32_expat/Makefile | 2 ++ compat32_fontconfig/Makefile | 2 ++ compat32_freetype2/Makefile | 2 ++ compat32_giflib/Makefile | 2 ++ compat32_jpeg/Makefile | 2 ++ compat32_lcms2/Makefile | 2 ++ compat32_libgcrypt/Makefile | 4 ++++ compat32_libgcrypt/buildlink3.mk | 3 +-- compat32_libgpg-error/Makefile | 2 ++ compat32_libuuid/Makefile | 2 ++ compat32_libxml2/Makefile | 2 ++ compat32_libxml2/Makefile.common | 4 ++-- compat32_libxslt/Makefile | 2 ++ compat32_libxslt/Makefile.common | 4 ++-- compat32_mit-krb5/Makefile | 2 ++ compat32_ncurses/Makefile.common | 2 ++ compat32_png/Makefile | 2 ++ compat32_tiff/Makefile | 2 ++ compat80-x11/Makefile | 2 ++ 19 files changed, 39 insertions(+), 6 deletions(-) diff --git a/compat32_expat/Makefile b/compat32_expat/Makefile index 2a1f798164..005d034dee 100644 --- a/compat32_expat/Makefile +++ b/compat32_expat/Makefile @@ -17,6 +17,8 @@ USE_LIBTOOL= yes GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/ CHECK_SHLIBS_SKIP= emul/netbsd32/bin/xmlwf +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + # C++ is needed for tests only #USE_LANGUAGES= c c++ #TEST_TARGET= check diff --git a/compat32_fontconfig/Makefile b/compat32_fontconfig/Makefile index d95eb67cdf..bf463e4bd4 100644 --- a/compat32_fontconfig/Makefile +++ b/compat32_fontconfig/Makefile @@ -29,6 +29,8 @@ CONFIGURE_ARGS+= --enable-docs CONFIGURE_ARGS+= --x-libraries=${PREFIX}/emul/netbsd32/lib CONFIGURE_ENV+= HASDOCBOOK=no +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + PKGCONFIG_OVERRIDE= fontconfig.pc.in _PKG_CONFIG_LIBDIR= ${BUILDLINK_DIR}/emul/netbsd32/lib/pkgconfig:${BUILDLINK_DIR}/emul/netbsd32/lib/freetype2/pkgconfig:${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig diff --git a/compat32_freetype2/Makefile b/compat32_freetype2/Makefile index f7729cd359..0c10523eb7 100644 --- a/compat32_freetype2/Makefile +++ b/compat32_freetype2/Makefile @@ -24,6 +24,8 @@ CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-harfbuzz=no CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q} +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + # Remove this when all dependent packages have switched to pkg-config CONFIGURE_ARGS+= --enable-freetype-config diff --git a/compat32_giflib/Makefile b/compat32_giflib/Makefile index 56711689ea..92436d42e3 100644 --- a/compat32_giflib/Makefile +++ b/compat32_giflib/Makefile @@ -10,4 +10,6 @@ GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/ BUILD_DIRS= lib INSTALL_DIRS= lib +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + .include "../../mk/bsd.pkg.mk" diff --git a/compat32_jpeg/Makefile b/compat32_jpeg/Makefile index 2c2dd47baa..8f9a5824dc 100644 --- a/compat32_jpeg/Makefile +++ b/compat32_jpeg/Makefile @@ -20,6 +20,8 @@ GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/ CONFIGURE_ARGS+= --disable-ld-version-script +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + INSTALLATION_DIRS= bin include share/doc/jpeg PKGCONFIG_OVERRIDE= libjpeg.pc.in diff --git a/compat32_lcms2/Makefile b/compat32_lcms2/Makefile index a76b8de763..87c804f628 100644 --- a/compat32_lcms2/Makefile +++ b/compat32_lcms2/Makefile @@ -16,6 +16,8 @@ GNU_CONFIGURE= yes TEST_TARGET= check GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/ +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + # lcms does not need zlib, but will look for it and link it to tifficc # if present. Therefore, we don't enjoin lcms from finding zlib, but # don't include it via bl3. diff --git a/compat32_libgcrypt/Makefile b/compat32_libgcrypt/Makefile index bf91b73ea7..a6ae83dc8e 100644 --- a/compat32_libgcrypt/Makefile +++ b/compat32_libgcrypt/Makefile @@ -17,6 +17,10 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 USE_LIBTOOL= yes GNU_CONFIGURE= yes +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + +CONFIGURE_ARGS+= --with-gpg-error-prefix=${PREFIX}/emul/netbsd32 + TEST_TARGET= check TEXINFO_REQD= 4.0 diff --git a/compat32_libgcrypt/buildlink3.mk b/compat32_libgcrypt/buildlink3.mk index 95b5b98ec4..c8d2075d7f 100644 --- a/compat32_libgcrypt/buildlink3.mk +++ b/compat32_libgcrypt/buildlink3.mk @@ -10,8 +10,7 @@ BUILDLINK_ABI_DEPENDS.compat32_libgcrypt+= compat32_libgcrypt>=1.6.0 BUILDLINK_PKGSRCDIR.compat32_libgcrypt?= ../../wip/compat32_libgcrypt BUILDLINK_LIBDIRS.compat32_libgcrypt?= emul/netbsd32/lib - -.include "../../security/libgpg-error/buildlink3.mk" +.include "../../wip/compat32_libgpg-error/buildlink3.mk" .endif # COMPAT32_LIBGCRYPT_BUILDLINK3_MK BUILDLINK_TREE+= -compat32_libgcrypt diff --git a/compat32_libgpg-error/Makefile b/compat32_libgpg-error/Makefile index 07f8a20f4c..afbb1c3af7 100644 --- a/compat32_libgpg-error/Makefile +++ b/compat32_libgpg-error/Makefile @@ -23,6 +23,8 @@ GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/ INFO_FILES= yes TEST_TARGET= check +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + .include "../../mk/bsd.prefs.mk" SUBST_CLASSES+= makefile diff --git a/compat32_libuuid/Makefile b/compat32_libuuid/Makefile index dde406ecb1..79b1772734 100644 --- a/compat32_libuuid/Makefile +++ b/compat32_libuuid/Makefile @@ -12,6 +12,8 @@ GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/ CONFIGURE_ARGS+= --enable-libuuid CONFIGURE_ARGS+= --enable-uuidgen +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + PKGCONFIG_OVERRIDE+= libuuid/uuid.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/compat32_libxml2/Makefile b/compat32_libxml2/Makefile index 4539852a1f..98b89900c5 100644 --- a/compat32_libxml2/Makefile +++ b/compat32_libxml2/Makefile @@ -19,6 +19,8 @@ CONFIGURE_ARGS+= --with-lzma=${BUILDLINK_PREFIX.xz} CONFIGURE_ARGS+= --without-python PKGCONFIG_OVERRIDE= libxml-2.0.pc.in +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + USE_LANGUAGES+= c99 .include "options.mk" diff --git a/compat32_libxml2/Makefile.common b/compat32_libxml2/Makefile.common index b719b95e99..69081cad23 100644 --- a/compat32_libxml2/Makefile.common +++ b/compat32_libxml2/Makefile.common @@ -11,5 +11,5 @@ MASTER_SITES+= http://xmlsoft.org/sources/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xmlsoft.org/ -DISTINFO_FILE= ${.CURDIR}/../../textproc/libxml2/distinfo -PATCHDIR= ${.CURDIR}/../../textproc/libxml2/patches +DISTINFO_FILE= ${.CURDIR}/../../wip/compat32_libxml2/distinfo +PATCHDIR= ${.CURDIR}/../../wip/compat32_libxml2/patches diff --git a/compat32_libxslt/Makefile b/compat32_libxslt/Makefile index 537f1e2f39..f804d2aef2 100644 --- a/compat32_libxslt/Makefile +++ b/compat32_libxslt/Makefile @@ -17,6 +17,8 @@ PKGCONFIG_OVERRIDE= libxslt.pc.in PKGCONFIG_OVERRIDE+= libexslt.pc.in TEST_TARGET= check +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms .include "../../mk/bsd.prefs.mk" diff --git a/compat32_libxslt/Makefile.common b/compat32_libxslt/Makefile.common index 1928cc7dbd..08cef75746 100644 --- a/compat32_libxslt/Makefile.common +++ b/compat32_libxslt/Makefile.common @@ -14,8 +14,8 @@ HOMEPAGE= http://xmlsoft.org/XSLT/ COMMENT= XSLT parser library from the GNOME project LICENSE= mit # with advertisement clause -PATCHDIR= ${.CURDIR}/../../textproc/libxslt/patches -DISTINFO_FILE= ${.CURDIR}/../../textproc/libxslt/distinfo +PATCHDIR= ${.CURDIR}/../../wip/compat32_libxslt/patches +DISTINFO_FILE= ${.CURDIR}/../../wip/compat32_libxslt/distinfo post-extract: cp ${WRKSRC}/libxslt/libxslt.syms ${WRKSRC}/libxslt/libxslt_solaris.syms diff --git a/compat32_mit-krb5/Makefile b/compat32_mit-krb5/Makefile index 1efd65409e..066b049c4f 100644 --- a/compat32_mit-krb5/Makefile +++ b/compat32_mit-krb5/Makefile @@ -17,6 +17,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src BUILD_TARGET= generate-files-mac all +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + .include "../../mk/bsd.prefs.mk" CONFLICTS+= heimdal-[0-9]* diff --git a/compat32_ncurses/Makefile.common b/compat32_ncurses/Makefile.common index f32cec7c34..05065144fc 100644 --- a/compat32_ncurses/Makefile.common +++ b/compat32_ncurses/Makefile.common @@ -35,6 +35,8 @@ CONFIGURE_ARGS+= --with-default-terminfo-dir=${PREFIX}/${TERMINFODIR} CONFIGURE_ARGS+= --with-terminfo-dirs=${PREFIX}/${TERMINFODIR} CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ncurses +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + SUBST_CLASSES+= rpath SUBST_FILES.rpath+= misc/ncurses-config SUBST_STAGE.rpath= post-configure diff --git a/compat32_png/Makefile b/compat32_png/Makefile index 607139c4f9..d0ff5acf59 100644 --- a/compat32_png/Makefile +++ b/compat32_png/Makefile @@ -23,6 +23,8 @@ CONFIGURE_ARGS+= --disable-unversioned-links # until pkgsrc is fixed to use libpng-config or the pc file everywhere INSTALL_TARGET= install install-header-links +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + PKGCONFIG_OVERRIDE= scripts/libpng.pc.in libpng.pc.in TEST_TARGET= check diff --git a/compat32_tiff/Makefile b/compat32_tiff/Makefile index ab7f8e24d5..bb6988e3a1 100644 --- a/compat32_tiff/Makefile +++ b/compat32_tiff/Makefile @@ -21,6 +21,8 @@ CONFIGURE_ARGS+= --enable-rpath CONFIGURE_ARGS+= --enable-cxx CONFIGURE_ARGS+= --without-x # just in case detects gl to build tiffgt +BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/emul/netbsd32 + PKGCONFIG_OVERRIDE= libtiff-4.pc.in TEST_TARGET= check diff --git a/compat80-x11/Makefile b/compat80-x11/Makefile index 27b238af2e..1a577a6307 100644 --- a/compat80-x11/Makefile +++ b/compat80-x11/Makefile @@ -17,6 +17,8 @@ CATEGORIES= emulators EMUL_PLATFORMS= netbsd-i386 ONLY_FOR_PLATFORM= NetBSD-[7-9]*-* NetBSD-[1-9][0-9]*-* +CHECK_RELRO_SUPPORTED= no + #.include "../../emulators/compat_netbsd/Makefile.common" DISTNAME= compat80-x11-${EMUL_ARCH}-${COMPAT_VERSION}