diff options
| author |   Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2019-10-22 08:13:03 +0200 |
|---|---|---|
| committer |   Sergei Trofimovich <slyfox@gentoo.org> | 2019-10-24 22:36:42 +0100 |
| commit | 0b2b12c325abcd39d63fd5a34eef72f126e95e3e (patch) | |
| tree | da79fbd0aa97bb4ba8b357b949e6ae534a08083e /sys-apps/nix | |
| parent | mail-filter/opendmarc: stable 1.3.2-r3 for hppa, bug #694968 (diff) | |
| download | gentoo-0b2b12c325abcd39d63fd5a34eef72f126e95e3e.tar.gz gentoo-0b2b12c325abcd39d63fd5a34eef72f126e95e3e.tar.bz2 gentoo-0b2b12c325abcd39d63fd5a34eef72f126e95e3e.zip | |
sys-apps/nix: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13376
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'sys-apps/nix')
| -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 | ||||
| -rw-r--r-- | sys-apps/nix/files/nix-1.11.6-systemd.patch | 10 | ||||
| -rw-r--r-- | sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch | 12 |
4 files changed, 0 insertions, 67 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 deleted file mode 100644 index 091fdcacba76..000000000000 --- a/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 12c094eb6180..000000000000 --- a/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch +++ /dev/null @@ -1,36 +0,0 @@ -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)) - diff --git a/sys-apps/nix/files/nix-1.11.6-systemd.patch b/sys-apps/nix/files/nix-1.11.6-systemd.patch deleted file mode 100644 index 5a77d7c77e5c..000000000000 --- a/sys-apps/nix/files/nix-1.11.6-systemd.patch +++ /dev/null @@ -1,10 +0,0 @@ -Make 'nix-daemon' a good unit for 'systemctl enable nix-daemon.service'. -diff --git a/misc/systemd/nix-daemon.service.in b/misc/systemd/nix-daemon.service.in -index 5fc04a3..2565520 100644 ---- a/misc/systemd/nix-daemon.service.in -+++ b/misc/systemd/nix-daemon.service.in -@@ -9 +9,4 @@ ExecStart=@@bindir@/nix-daemon nix-daemon --daemon - KillMode=process -+ -+[Install] -+WantedBy=multi-user.target diff --git a/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch b/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch deleted file mode 100644 index ff37f48e3607..000000000000 --- a/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch +++ /dev/null @@ -1,12 +0,0 @@ -Add a missing library for gdwgc-8 ---- a/configure.ac -+++ b/configure.ac -@@ -226,6 +226,8 @@ AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc], - if test "$gc" = yes; then - PKG_CHECK_MODULES([BDW_GC], [bdw-gc]) - CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS" -+ # a workaround for https://bugs.gentoo.org/679834 -+ BDW_GC_LIBS="$BDW_GC_LIBS -lgccpp" - AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.]) - fi - |