pkgsrc-WIP-changes archive

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

nix: apply some changes/hacks to pass configure phase.



Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%n0.is@localhost>
Pushed By:	ng0
Date:		Thu Jun 27 19:08:18 2019 +0000
Changeset:	8e4681b51445434038a6ad3702dccf37291bb00b

Modified Files:
	nix/Makefile

Log Message:
nix: apply some changes/hacks to pass configure phase.

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

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

diffstat:
 nix/Makefile | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diffs:
diff --git a/nix/Makefile b/nix/Makefile
index 3da472d339..3f8ea0ee88 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE=	https://github.com/NixOS/nix/
 COMMENT=	Purely functional package manager
 LICENSE=	gnu-lgpl-v2.1
 
-USE_TOOLS+=	pkg-config yacc flex automake autoconf autoreconf #bison?
+USE_TOOLS+=	pkg-config flex automake autoconf autoreconf bash gmake bison
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
@@ -19,14 +19,46 @@ PKGCONFIG_OVERRIDE+=	src/libstore/nix-store.pc.in
 
 CONFIGURE_ARGS+=	--with-sandbox-shell=/bin/sh
 CONFIGURE_ARGS+=	--enable-gc
-CONFIGURE_ARGS+=	--disable-s3
-#CONFIGURE_ARGS+=	--localstatedir=
 
+# s3 option needs s3-cpp, this was reported as a cause for error if left unchanged.
+CONFIGURE_ENV+=		ac_cv_header_aws_s3_S3Client_h=no
 CONFIGURE_ENV+=		EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
 CONFIGURE_ENV+=		EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
 CONFIGURE_ENV+=		LIBLZMA_CFLAGS=${BUILDLINK_PREFIX.lzmalib:Q}/include
 CONFIGURE_ENV+=		LIBLZMA_LIBS=${BUILDLINK_PREFIX.lzmalib:Q}/lib
 
+# Workaround for:
+#   /usr/bin/ld: error: undefined symbol: SHA512_Update
+MAKE_ARGS+=	libutil_ALLOW_UNDEFINED=yes
+
+# checking for aws/s3/S3Client.h... (cached) no
+# ./configure: 7003: Syntax error: "(" unexpected (expecting "fi")
+# *** Error code 2
+# hack configure.ac bashism, work on an upstream fix for this,
+# thanks 0mp%FreeBSD.org@localhost for this tiny detail:
+CONFIG_SHELL=		${BASH}
+
+# incomplete, remove once the docs build
+CONFIGURE_ARGS+=	--disable-doc-gen
+
+SUBST_CLASSES+=         docbook
+SUBST_MESSAGE.docbook=  Fixing docbook URLs.
+SUBST_FILES.docbook+=   doc/manual/installation/prerequisites-source.xml
+SUBST_FILES.docbook+=   doc/manual/local.mk
+SUBST_FILES.docbook+=   doc/manual/manual.xmli
+SUBST_STAGE.docbook=    pre-configure
+SUBST_SED.docbook+=     -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
+
+# and one more.
+SUBST_CLASSES+=         docbook2
+SUBST_MESSAGE.docbook2=  Fixing docbook URLs.
+SUBST_FILES.docbook2+=   doc/manual/local.mk
+SUBST_STAGE.docbook2=    pre-configure
+SUBST_SED.docbook2+=     -e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
+
+BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
 pre-configure:
 	cd ${WRKSRC} && ${SH} bootstrap.sh
 


Home | Main Index | Thread Index | Old Index