diff options
| author |   David Seifert <soap@gentoo.org> | 2016-03-06 23:58:40 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-03-07 00:04:55 +0100 |
| commit | e4cad4b39c4b1f35a2ffe4a7c747fa1ac1a6f9cc (patch) | |
| tree | b95aebdb143d761773c3f87eba17c8b3bdef6046 /sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch | |
| parent | media-libs/babl: Add use flag for CPU feature f16c (bug #576388) (diff) | |
| download | gentoo-e4cad4b39c4b1f35a2ffe4a7c747fa1ac1a6f9cc.tar.gz gentoo-e4cad4b39c4b1f35a2ffe4a7c747fa1ac1a6f9cc.tar.bz2 gentoo-e4cad4b39c4b1f35a2ffe4a7c747fa1ac1a6f9cc.zip | |
sci-mathematics/calc: Version bump to 2.12.5.4
Gentoo-Bug: 524544
* EAPI=6
Package-Manager: portage-2.2.27
Diffstat (limited to 'sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch')
| -rw-r--r-- | sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch | 161 |
1 files changed, 161 insertions, 0 deletions
diff --git a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch new file mode 100644 index 000000000000..3e7e03002ac3 --- /dev/null +++ b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch @@ -0,0 +1,161 @@ +--- calc-2.12.5.3/Makefile ++++ calc-2.12.5.3/Makefile +@@ -1136,14 +1136,14 @@ + 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}" +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" ++LD_SHARE= ++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= +@@ -1173,7 +1173,6 @@ + BLD_TYPE= calc-dynamic-only + # + CC_SHARE= -fPIC +-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib + LD_SHARE= ${DARWIN_ARCH} + #SET_INSTALL_NAME= no + SET_INSTALL_NAME= yes +@@ -1249,14 +1248,14 @@ + 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}" +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" ++LD_SHARE= ++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= +@@ -1294,12 +1293,10 @@ + 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}" +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" ++LD_SHARE= ++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 +@@ -1333,12 +1330,10 @@ + 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}" +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" ++LD_SHARE= ++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 +@@ -1370,12 +1365,10 @@ + 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}" +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" ++LD_SHARE= ++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 +@@ -1411,11 +1404,9 @@ + 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}" +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" +-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" ++LD_SHARE= ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" ++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" + # + CC_STATIC= + LD_STATIC= +@@ -1470,12 +1461,11 @@ + 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}" +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" ++LD_SHARE= ++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 +@@ -1510,14 +1500,14 @@ + 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}" +-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" ++LD_SHARE= ++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= +@@ -2110,7 +2100,7 @@ + + 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} |