You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
200 lines
7.8 KiB
200 lines
7.8 KiB
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1384,9 +1384,6 @@ ifeq ($(target),Linux)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -1436,7 +1433,6 @@ ifeq ($(target),Darwin)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
|
|
LD_SHARE= ${DARWIN_ARCH}
|
|
#SET_INSTALL_NAME= no
|
|
SET_INSTALL_NAME= yes
|
|
@@ -1518,9 +1514,6 @@ ifeq ($(target),FreeBSD)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -1578,9 +1571,6 @@ ifeq ($(target),OpenBSD)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -1632,9 +1622,6 @@ ifeq ($(target),SunOS)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -1684,9 +1671,6 @@ ifeq ($(target),Cygwin)
|
|
BLD_TYPE= calc-static-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -1740,9 +1724,6 @@ ifeq ($(target),simple)
|
|
BLD_TYPE= calc-static-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
#
|
|
@@ -1799,9 +1780,6 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
|
|
BLD_TYPE= calc-static-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -1839,9 +1817,6 @@ ifeq ($(target),)
|
|
BLD_TYPE= calc-static-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -2115,7 +2090,6 @@ CUSTOM_PASSDOWN= \
|
|
CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
|
|
CUSTOMINCDIR="${CUSTOMINCDIR}" \
|
|
DEBUG="${DEBUG}" \
|
|
- DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \
|
|
E="${E}" \
|
|
FMT=${FMT} \
|
|
GREP=${GREP} \
|
|
@@ -4510,7 +4484,6 @@ env:
|
|
@echo 'C_SRC=${C_SRC}'; echo ''
|
|
@echo 'DATE=${DATE}'; echo ''
|
|
@echo 'DEBUG=${DEBUG}'; echo ''
|
|
- @echo 'DEFAULT_LIB_INSTALL_PATH=${DEFAULT_LIB_INSTALL_PATH}'; echo ''
|
|
@echo 'DEV_BITS=${DEV_BITS}'; echo ''
|
|
@echo 'DIFF=${DIFF}'; echo ''
|
|
@echo 'DISTLIST=${DISTLIST}'; echo ''
|
|
--- a/custom/Makefile
|
|
+++ b/custom/Makefile
|
|
@@ -667,9 +667,6 @@ ifeq ($(target),Linux)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -719,7 +716,6 @@ ifeq ($(target),Darwin)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:${PREFIX}/lib
|
|
LD_SHARE= ${DARWIN_ARCH}
|
|
#SET_INSTALL_NAME= no
|
|
SET_INSTALL_NAME= yes
|
|
@@ -801,9 +797,6 @@ ifeq ($(target),FreeBSD)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -861,9 +854,6 @@ ifeq ($(target),OpenBSD)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -915,9 +905,6 @@ ifeq ($(target),SunOS)
|
|
BLD_TYPE= calc-dynamic-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -967,9 +954,6 @@ ifeq ($(target),Cygwin)
|
|
BLD_TYPE= calc-static-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -1023,9 +1007,6 @@ ifeq ($(target),simple)
|
|
BLD_TYPE= calc-static-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
#
|
|
@@ -1082,9 +1063,6 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
|
|
BLD_TYPE= calc-static-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
@@ -1122,9 +1100,6 @@ ifeq ($(target),)
|
|
BLD_TYPE= calc-static-only
|
|
#
|
|
CC_SHARE= -fPIC
|
|
-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/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}"
|
|
ifdef ALLOW_CUSTOM
|
|
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
|
--
|
|
2.31.1
|
|
|