nix: update, fix some compile issues

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: nix: update, fix some compile issues
From: nikita <nikita%NetBSD.org@localhost>
Date: Sat, 01 Aug 2020 15:08:35 +0000
Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Sat Aug 1 17:08:35 2020 +0200
Changeset:	21a3c281e17e19d790d6b7fa9f26d0ab5bc883b6

Modified Files:
	nix/Makefile
	nix/TODO
	nix/distinfo
Removed Files:
	nix/patches/patch-src_nix_main.cc

Log Message:
nix: update, fix some compile issues

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

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

diffstat:
 nix/Makefile                      | 30 ++++++++++++++++--------------
 nix/TODO                          | 27 +++++++++++++++++++++++++--
 nix/distinfo                      |  9 ++++-----
 nix/patches/patch-src_nix_main.cc | 15 ---------------
 4 files changed, 45 insertions(+), 36 deletions(-)

diffs:
diff --git a/nix/Makefile b/nix/Makefile
index f6b879b4a1..a3fed5be9c 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
-DISTNAME=		nix-2.3.1
+DISTNAME=		nix-2.3.7
 CATEGORIES=		wip
 MASTER_SITES=		${MASTER_SITE_GITHUB:=NixOS/}
 
-MAINTAINER=		ng0%NetBSD.org@localhost
+MAINTAINER=		nikita%NetBSD.org@localhost
 HOMEPAGE=		https://github.com/NixOS/nix/
 COMMENT=		Purely functional package manager
 LICENSE=		gnu-lgpl-v2.1
@@ -22,6 +22,7 @@ PKGCONFIG_OVERRIDE+=	src/libstore/nix-store.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
+# CONFIGURE_ARGS+=	--localstatedir=/nix/var
 CONFIGURE_ARGS+=	--with-sandbox-shell=/bin/sh
 CONFIGURE_ARGS+=	--enable-gc
 
@@ -32,11 +33,11 @@ CONFIGURE_ENV+=		ac_cv_header_aws_s3_S3Client_h=no
 #CONFIGURE_ENV+=	EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
 #CONFIGURE_ENV+=	EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include/readline
 CONFIGURE_ENV+=		EDITLINE_CFLAGS="-DREADLINE"
-CONFIGURE_ENV+=		EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
+CONFIGURE_ENV+=		EDITLINE_LIBS=-L${BUILDLINK_PREFIX.editlinereadline:Q}/lib
 #CONFIGURE_ENV+=	EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editline:Q}/include/readline
 #CONFIGURE_ENV+=	EDITLINE_LIBS=${BUILDLINK_PREFIX.editline:Q}/lib
-CONFIGURE_ENV+=		LIBLZMA_CFLAGS=${BUILDLINK_PREFIX.lzmalib:Q}/include
-CONFIGURE_ENV+=		LIBLZMA_LIBS=${BUILDLINK_PREFIX.lzmalib:Q}/lib
+CONFIGURE_ENV+=		LIBLZMA_CFLAGS="-I${BUILDLINK_PREFIX.lzmalib:Q}/include"
+CONFIGURE_ENV+=		LIBLZMA_LIBS="-llzma -L${BUILDLINK_PREFIX.lzmalib:Q}/lib"
 CONFIGURE_ENV+=		BOOST_ROOT=${BUILDLINK_PREFIX.boost:Q}/lib
 
 # Workaround for:
@@ -44,9 +45,9 @@ CONFIGURE_ENV+=		BOOST_ROOT=${BUILDLINK_PREFIX.boost:Q}/lib
 MAKE_ARGS+=	libutil_ALLOW_UNDEFINED=yes
 
 # verbose build
-# MAKE_ENV+=	V=1
+MAKE_ENV+=	V=1
 # Disable hardcoded -O3
-# MAKE_ENV+=	OPTIMIZE=0
+MAKE_ENV+=	OPTIMIZE=0
 
 # checking for aws/s3/S3Client.h... (cached) no
 # ./configure: 7863: Syntax error: "(" unexpected (expecting "fi")
@@ -58,13 +59,13 @@ CONFIG_SHELL=		${TOOLS_PATH.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'
+#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.xml
+#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
@@ -103,4 +104,5 @@ pre-configure:
 .include "../../security/libsodium/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+#.include "../../wip/aws-sdk-cpp/buildlink3.mk" # Needs some source fixes
 .include "../../mk/bsd.pkg.mk"
diff --git a/nix/TODO b/nix/TODO
index 89beeee5fb..008b6cddff 100644
--- a/nix/TODO
+++ b/nix/TODO
@@ -3,7 +3,30 @@
   must be tested and non-supported (like NetBSD host) ported to.
 
 * building TODO:
-  LD     src/libutil/libnixutil.so
-/usr/pkg/lib: file not recognized: file format not recognized
+c++ -std=c++17 -o src/libexpr/value-to-xml.o -c src/libexpr/value-to-xml.cc -g -Wall -include config.h -fPIC -g -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr -I src/nix  -I/usr/pkg/include -I/usr/pkg/include -I/usr/pkg/include -I/usr/pkg/include -DREADLINE -I/usr/pkg/include -O2 -D_FORTIFY_SOURCE=2 -pthread -I/usr/pkg/include -I/usr/include -I/usr/include/readline -I/usr/pkg/include/sodium -I/usr/include/krb5  -MMD -MF src/libexpr/.value-to-xml.o.dep -MP
+c++ -std=c++17 -o /usr/work/wip/nix/work/nix-2.3.7/src/libutil/libnixutil.so -shared -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib -pthread -Wl,--no-copy-dt-needed-entries src/libutil/affinity.o src/libutil/archive.o src/libutil/args.o src/libutil/compression.o src/libutil/config.o src/libutil/hash.o src/libutil/json.o src/libutil/logging.o src/libutil/serialise.o src/libutil/thread-pool.o src/libutil/util.o src/libutil/xml-writer.o -llzma -L/usr/pkg/lib -lbz2 -pthread -lcrypto -L/usr/pkg/lib -lbrotlienc -lbrotlidec  -lboost_context -Wl,-z,defs -Wl,-soname=libnixutil.so   
+ld: src/libutil/compression.o: in function `nix::XzDecompressionSink::XzDecompressionSink(nix::Sink&)':
+/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:54: undefined reference to `lzma_stream_decoder'
+ld: src/libutil/compression.o: in function `nix::XzCompressionSink::XzCompressionSink(nix::Sink&, bool)':
+/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:258: undefined reference to `lzma_easy_encoder'
+ld: src/libutil/compression.o: in function `nix::XzCompressionSink::~XzCompressionSink()':
+/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:271: undefined reference to `lzma_end'
+ld: src/libutil/compression.o: in function `nix::XzDecompressionSink::~XzDecompressionSink()':
+/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:65: undefined reference to `lzma_end'
+ld: src/libutil/compression.o: in function `nix::XzCompressionSink::~XzCompressionSink()':
+/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:271: undefined reference to `lzma_end'
+ld: src/libutil/compression.o: in function `nix::XzDecompressionSink::~XzDecompressionSink()':
+/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:65: undefined reference to `lzma_end'
+ld: /usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:65: undefined reference to `lzma_end'
+ld: src/libutil/compression.o:/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:271: more undefined references to `lzma_end' follow
+ld: src/libutil/compression.o: in function `nix::XzCompressionSink::write(unsigned char const*, unsigned long)':
+/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:288: undefined reference to `lzma_code'
+ld: /usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:288: undefined reference to `lzma_code'
+ld: src/libutil/compression.o: in function `nix::XzDecompressionSink::write(unsigned char const*, unsigned long)':
+/usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:82: undefined reference to `lzma_code'
+ld: /usr/work/wip/nix/work/nix-2.3.7/src/libutil/compression.cc:82: undefined reference to `lzma_code'
 gmake: *** [mk/lib.mk:104: src/libutil/libnixutil.so] Error 1
 gmake: *** Waiting for unfinished jobs....
+*** Error code 2
+
+
diff --git a/nix/distinfo b/nix/distinfo
index bbced64e4d..24f9219fc0 100644
--- a/nix/distinfo
+++ b/nix/distinfo
@@ -1,8 +1,7 @@
 $NetBSD$
 
-SHA1 (nix-2.3.1.tar.gz) = 7a08687d40b3f2fd80d3e315195e956eab787f10
-RMD160 (nix-2.3.1.tar.gz) = 65fe91b3cd5ea9ebf2a1fdaa848a8ffb02f2043e
-SHA512 (nix-2.3.1.tar.gz) = 47b2455cd9527bd6dae1eb35351c679e230b69429315be73b2c49c7d649044e5e39d09d6d95d5c946061548d2aa25eff62535655a6033a6740ab40641f02c11d
-Size (nix-2.3.1.tar.gz) = 894698 bytes
+SHA1 (nix-2.3.7.tar.gz) = a74f330e5265829031a5a18a8f4e092cccb149ce
+RMD160 (nix-2.3.7.tar.gz) = bd5e5893f73784aaf26def6f45bd4ddd8209dd84
+SHA512 (nix-2.3.7.tar.gz) = 18516df4bac346d651ac550d088f6ee378bd7ff6c644c1cf9a59445792bd10765444b4dcdad44a06ac914dbf80021c57dd4496bef2d7a0db45cdee2a5ecdc47d
+Size (nix-2.3.7.tar.gz) = 900906 bytes
 SHA1 (patch-src_libexpr_primops_fetchGit.cc) = eed459c989279873a8b48044e0925de88cb358b0
-SHA1 (patch-src_nix_main.cc) = 060a7020ecfa416b5da2cf1afcd4c9307815362e
diff --git a/nix/patches/patch-src_nix_main.cc b/nix/patches/patch-src_nix_main.cc
deleted file mode 100644
index 46c336b8da..0000000000
--- a/nix/patches/patch-src_nix_main.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Upstream commit b811bd2172bc9796f42b87996f455d4e5e4382ba
-Missing include.
-
---- src/nix/main.cc~
-+++ src/nix/main.cc
-@@ -15,6 +15,7 @@
- #include <sys/socket.h>
- #include <ifaddrs.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- 
- extern std::string chrootHelperName;
-
Prev by Date: py-virtualenv20: Update to 20.0.29
Next by Date: commandergenius: update to Commander-Genius-2.4.6
Previous by Thread: py-virtualenv20: Update to 20.0.29
Next by Thread: commandergenius: update to Commander-Genius-2.4.6
Indexes:
Home | Main Index | Thread Index | Old Index