pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libxslt-32: Install package to ${PREFIX}/emul/netbsd32/



Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Mon Jul 22 01:25:00 2019 +0200
Changeset:	9657f3d6e16cf490aa7bee0b1879266226874db7

Modified Files:
	libxslt-32/Makefile
	libxslt-32/buildlink3.mk

Log Message:
libxslt-32: Install package to ${PREFIX}/emul/netbsd32/

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9657f3d6e16cf490aa7bee0b1879266226874db7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libxslt-32/Makefile      | 11 ++---------
 libxslt-32/buildlink3.mk |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diffs:
diff --git a/libxslt-32/Makefile b/libxslt-32/Makefile
index 30a8144655..d3a9a30d3a 100644
--- a/libxslt-32/Makefile
+++ b/libxslt-32/Makefile
@@ -8,11 +8,10 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
+GNU_CONFIGURE_PREFIX=   ${PREFIX}/emul/netbsd32/
+CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.compat32_libxml2}
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--with-html-subdir=libxslt
-LIBABISUFFIX?=          /32
-CONFIGURE_ARGS+=        --libdir=${PREFIX}/lib${LIBABISUFFIX}
 CFLAGS+=                -m32
 
 PKGCONFIG_OVERRIDE=	libxslt.pc.in
@@ -28,12 +27,6 @@ CPPFLAGS+=	-Dsocklen_t=int
 
 BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.27
 
-remove non-libraries:
-	echo "Removing non-compat library package content"
-	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} -prune -o -type f -exec ${RM} {} +
-
-post-install: remove non-libraries
-
 .include "../../wip/libgcrypt-32/buildlink3.mk"
 .include "../../wip/libgpg-error-32/buildlink3.mk"
 .include "../../wip/libxml2-32/buildlink3.mk"
diff --git a/libxslt-32/buildlink3.mk b/libxslt-32/buildlink3.mk
index 4965643d0a..22ffb575ac 100644
--- a/libxslt-32/buildlink3.mk
+++ b/libxslt-32/buildlink3.mk
@@ -8,7 +8,7 @@ COMPAT32_LIBXSLT_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.compat32_libxslt+=	compat32_libxslt>=1.1.8
 BUILDLINK_ABI_DEPENDS.compat32_libxslt+=	compat32_libxslt>=1.1.28nb2
 BUILDLINK_PKGSRCDIR.compat32_libxslt?=	../../wip/libxslt-32
-BUILDLINK.LIBDIRS.compat32_libxslt=	lib/32
+BUILDLINK.LIBDIRS.compat32_libxslt=	emul/netbsd32/lib
 
 .include "../../wip/libgcrypt-32/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"


Home | Main Index | Thread Index | Old Index