diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2019-09-07 23:44:34 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2019-09-07 23:44:34 +0100 |
| commit | 04d7a13d933a0fb7266df332ddaa2a2d1141d7be (patch) | |
| tree | 37caeec4204821c8e4026e4be96e41da9925de08 /Makefile | |
| parent | gcc-config: add einfo logging around library backup (diff) | |
| download | gcc-config-04d7a13d933a0fb7266df332ddaa2a2d1141d7be.tar.gz gcc-config-04d7a13d933a0fb7266df332ddaa2a2d1141d7be.tar.bz2 gcc-config-04d7a13d933a0fb7266df332ddaa2a2d1141d7be.zip | |
Revert "gcc-config: store gcc backup into /lib/gcc-backup, not /lib"
This reverts commit 44570a44be60a8fc33bd05089047c1f2980b3047.
Unfortunately ld.so does has static set of fallback paths
when it fails to lookup shared library from ld.so.cache:
those are /lib64 and /usr/lib64 on amd64.
Let's revert the change and jkeep relying on /lib64 for now.
Bug: https://bugs.gentoo.org/667020
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 3 insertions, 19 deletions
@@ -3,7 +3,6 @@ EPREFIX ?= PN = gcc-config PV = git P = $(PN)-$(PV) -BACKUPDIR = gcc-backup PREFIX = $(EPREFIX)/usr BINDIR = $(PREFIX)/bin @@ -12,18 +11,15 @@ ESELECTDIR = $(PREFIX)/share/eselect/modules SUBLIBDIR = lib LIBDIR = $(PREFIX)/$(SUBLIBDIR) -LIBGCC_BACKUPDIR = $(EPREFIX)/$(SUBLIBDIR)/$(BACKUPDIR) - -ENVD = $(EPREFIX)/etc/env.d MKDIR_P = mkdir -p -m 755 INSTALL_EXE = install -m 755 INSTALL_DATA = install -m 644 -all: .gcc-config .envd-gcc-backup +all: .gcc-config clean: - rm -f .gcc-config .envd-gcc-backup + rm -f .gcc-config .gcc-config: gcc-config sed \ @@ -31,26 +27,14 @@ clean: -e 's:@GENTOO_EPREFIX@:$(EPREFIX):g' \ -e 's:@GENTOO_LIBDIR@:$(SUBLIBDIR):g' \ -e 's:@PV@:$(PV):g' \ - -e 's:@GENTOO_GCC_BACKUP_DIR@:$(BACKUPDIR):g' \ $< > $@ chmod a+rx $@ -.envd-gcc-backup: envd-gcc-backup - sed \ - -e 's:@LIBGCC_BACKUPDIR@:$(LIBGCC_BACKUPDIR):g' \ - $< > $@ - install: all - $(MKDIR_P) $(DESTDIR)$(BINDIR) + $(MKDIR_P) $(DESTDIR)$(BINDIR) $(DESTDIR)$(ESELECTDIR) $(DESTDIR)$(DOCDIR) $(INSTALL_EXE) .gcc-config $(DESTDIR)$(BINDIR)/gcc-config - $(MKDIR_P) $(DESTDIR)$(ESELECTDIR) $(INSTALL_DATA) gcc.eselect $(DESTDIR)$(ESELECTDIR) - $(MKDIR_P) $(DESTDIR)$(DOCDIR) $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR) - $(MKDIR_P) $(DESTDIR)$(LIBGCC_BACKUPDIR) - $(INSTALL_DATA) gcc-backup/README $(DESTDIR)$(LIBGCC_BACKUPDIR) - $(MKDIR_P) $(DESTDIR)$(ENVD) - $(INSTALL_DATA) .envd-gcc-backup $(DESTDIR)$(ENVD)/99gcc-backup test check: .gcc-config cd tests && ./run_tests |