summaryrefslogtreecommitdiff
path: root/sci-electronics/magic/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
commit2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
treec8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sci-electronics/magic/files
parente9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
gentoo resync : 05.12.2021
Diffstat (limited to 'sci-electronics/magic/files')
-rw-r--r--sci-electronics/magic/files/magic-8.3.232-libdir.patch13
-rw-r--r--sci-electronics/magic/files/magic-8.3.232-verbose-build.patch (renamed from sci-electronics/magic/files/magic-7.5.231-verbose-build.patch)16
2 files changed, 21 insertions, 8 deletions
diff --git a/sci-electronics/magic/files/magic-8.3.232-libdir.patch b/sci-electronics/magic/files/magic-8.3.232-libdir.patch
new file mode 100644
index 000000000000..fbfe8557287d
--- /dev/null
+++ b/sci-electronics/magic/files/magic-8.3.232-libdir.patch
@@ -0,0 +1,13 @@
+'lib' is for 32-bit libraries only, thank you very much
+
+--- a/scripts/defs.mak.in
++++ b/scripts/defs.mak.in
+@@ -36,7 +36,7 @@
+ # Install targets may be different if dist_prefix is set by configure
+ INSTALL_BINDIR = @DIST_DIR@/bin
+ INSTALL_MANDIR = @DIST_DIR@/share/man
+-INSTALL_LIBDIR = @DIST_DIR@/lib
++INSTALL_LIBDIR = ${libdir}
+ INSTALL_SYSDIR = ${INSTALL_LIBDIR}/magic/sys
+ INSTALL_SCMDIR = ${INSTALL_LIBDIR}/magic/scm
+ INSTALL_TCLDIR = ${INSTALL_LIBDIR}/magic/tcl
diff --git a/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch b/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch
index 64ad4fd18278..8455d7bb1931 100644
--- a/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch
+++ b/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch
@@ -1,5 +1,5 @@
---- magic-7.5.231/Makefile
-+++ magic-7.5.231/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -18,12 +18,10 @@
all: $(ALL_TARGET)
@@ -15,19 +15,19 @@
force: clean all
-@@ -67,7 +65,7 @@
+@@ -68,7 +66,7 @@
install-magic:
- @echo --- installing executable to $(DESTDIR)${BINDIR}
- @echo --- installing runtime files to $(DESTDIR)${LIBDIR}
+ @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
+ @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR}
- @${MAKE} install-real 2>&1 >> install.log
+ @${MAKE} install-real
install-real: install-dirs
for dir in ${INSTALL_CAD_DIRS}; do \
-@@ -86,7 +84,7 @@
+@@ -89,7 +87,7 @@
install-tcl:
- @echo --- installing executable to $(DESTDIR)${BINDIR}
- @echo --- installing runtime files to $(DESTDIR)${LIBDIR}
+ @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
+ @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR}
- @${MAKE} install-tcl-real 2>&1 >> install.log
+ @${MAKE} install-tcl-real