diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2017-01-23 21:24:03 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-01-23 21:24:03 +0000 |
| commit | fe992f877f5bc3bee3033b693a6f5a8601d423ca (patch) | |
| tree | 8f7ff9d06b72caf09cbfd64501cd677eb5b90a7d /sys-apps/nix/files | |
| parent | 6b772bf4cab6d9a65e67519b9ee167e59331447c (diff) | |
| download | gentoo-fe992f877f5bc3bee3033b693a6f5a8601d423ca.tar.gz gentoo-fe992f877f5bc3bee3033b693a6f5a8601d423ca.tar.xz | |
sys-apps/nix: respect CFLAGS/CXXFLAGS/LDFLAGS, require boehm-gx[cxx]
Thanks to wiselord on freenode/#haskell-by who
noticed missing boehm-gx[cxx] DEPEND.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-apps/nix/files')
| -rw-r--r-- | sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch | 9 | ||||
| -rw-r--r-- | sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch | 36 |
2 files changed, 45 insertions, 0 deletions
diff --git a/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch b/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch new file mode 100644 index 00000000000..091fdcacba7 --- /dev/null +++ b/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch @@ -0,0 +1,9 @@ +diff --git a/configure.ac b/configure.ac +index 3a24053..1b99702 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,4 +57,2 @@ fi + +-CFLAGS= +-CXXFLAGS= + AC_PROG_CC diff --git a/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch b/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch new file mode 100644 index 00000000000..12c094eb618 --- /dev/null +++ b/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile.config.in b/Makefile.config.in +index f0de4da..c82fbfd 100644 +--- a/Makefile.config.in ++++ b/Makefile.config.in +@@ -5,2 +5,3 @@ CXX = @CXX@ + CXXFLAGS = @CXXFLAGS@ ++LDFLAGS = @LDFLAGS@ + HAVE_SODIUM = @HAVE_SODIUM@ +diff --git a/mk/libraries.mk b/mk/libraries.mk +index 3cd7a53..f7bd015 100644 +--- a/mk/libraries.mk ++++ b/mk/libraries.mk +@@ -88,3 +88,3 @@ define build-library + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/ +- $$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED) ++ $$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED) + +@@ -102,3 +102,3 @@ define build-library + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/ +- $$(trace-ld) $(CXX) -o $$@ -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) ++ $$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + +diff --git a/mk/programs.mk b/mk/programs.mk +index 3ac6449..f553ce2 100644 +--- a/mk/programs.mk ++++ b/mk/programs.mk +@@ -34,3 +34,3 @@ define build-program + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/ +- $$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) ++ $$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + +@@ -48,3 +48,3 @@ define build-program + $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/ +- $$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) ++ $$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + |