From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- sci-mathematics/calc/files/2.12.4.0-ldflags.patch | 101 --------------------- .../calc/files/calc-2.12.4.13-prefix.patch | 87 ------------------ 2 files changed, 188 deletions(-) delete mode 100644 sci-mathematics/calc/files/2.12.4.0-ldflags.patch delete mode 100644 sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch (limited to 'sci-mathematics/calc/files') diff --git a/sci-mathematics/calc/files/2.12.4.0-ldflags.patch b/sci-mathematics/calc/files/2.12.4.0-ldflags.patch deleted file mode 100644 index 0f2b67d2c084..000000000000 --- a/sci-mathematics/calc/files/2.12.4.0-ldflags.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/Makefile b/Makefile -index b526442..baa8273 100644 ---- a/Makefile -+++ b/Makefile -@@ -1144,11 +1144,13 @@ BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - else --LIBCUSTCALC_SHLIB= -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - endif - # - CC_STATIC= -@@ -1227,9 +1229,9 @@ BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -1267,9 +1269,9 @@ BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -1304,9 +1306,9 @@ CC_SHARE= -fPIC - DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib - LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -1340,8 +1342,8 @@ BLD_TYPE= calc-static-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - # - CC_STATIC= - LD_STATIC= -@@ -1394,9 +1396,9 @@ BLD_TYPE= calc-static-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -1431,9 +1433,9 @@ CC_SHARE= -fPIC - DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib - LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -2002,7 +2004,7 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \ - - calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} - ${RM} -f $@ -- ${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ -+ ${CC} ${LDFLAGS} ${CALCOBJS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ - ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ - - libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE} diff --git a/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch b/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch deleted file mode 100644 index 727618c3fe71..000000000000 --- a/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Makefile b/Makefile -index cc84386..b526442 100644 ---- a/Makefile -+++ b/Makefile -@@ -1143,9 +1143,7 @@ ifeq ($(target),Linux) - BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -@@ -1177,9 +1175,8 @@ ifeq ($(target),Darwin) - BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib - LD_SHARE= ${DARWIN_ARCH} --LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -+LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION} - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib - else -@@ -1196,7 +1193,7 @@ CCWERR= - CCOPT= ${DEBUG} - CCMISC= ${DARWIN_ARCH} - # --LCC= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} gcc -+LCC= gcc - CC= ${PURIFY} ${LCC} ${CCWERR} - # - # Darmin dynamic shared lib filenames -@@ -1211,7 +1208,6 @@ LDCONFIG:= - # DARWIN_ARCH= -arch i386 # Intel binary - # DARWIN_ARCH= -arch ppc # PPC binary - DARWIN_ARCH= # native binary --MACOSX_DEPLOYMENT_TARGET=10.8 - # - endif - -@@ -1230,9 +1226,7 @@ ifeq ($(target),FreeBSD) - BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -@@ -1272,9 +1266,7 @@ ifeq ($(target),OpenBSD) - BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -@@ -1347,9 +1339,7 @@ ifeq ($(target),simple) - BLD_TYPE= calc-static-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - # -@@ -1403,9 +1393,7 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit - BLD_TYPE= calc-static-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -- cgit v1.2.3