X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.shared;h=1b14dd145027a0463296510a6f5f816315def3cf;hp=d0ff69c83c8fc4ba1ba61ca69475208e448983fc;hb=b554eef43b9ac5b92f590da6a120dbfd9ca0582e;hpb=30fbcaa213866426c9f6b9dad01b9885ab760e31 diff --git a/Makefile.shared b/Makefile.shared index d0ff69c83c..1b14dd1450 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -7,6 +7,7 @@ # CC contains the current compiler. This one MUST be defined CC=cc +CFLAGS=$(CFLAG) # LDFLAGS contains flags to be used when temporary object files (when building # shared libraries) are created, or when an application is linked. # SHARED_LDFLAGS contains flags to be used when the shared library is created. @@ -66,8 +67,8 @@ LIBDEPS= #------------------------------------------------------------------------------ # The rest is private to this makefile. -#DEBUG=: -DEBUG=set -x +SET_X=: +#SET_X=set -x top: echo "Trying to use this makefile interactively? Don't." @@ -87,45 +88,55 @@ CALC_VERSIONS= \ fi LINK_APP= \ - ( $(DEBUG); \ + ( $(SET_X); \ + LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ - $$LDCMD $(LDFLAGS) $$LDFLAGS -o $$APPNAME $(OBJECTS) $$LIBDEPS ) + $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) LINK_SO= \ - ( $(DEBUG); \ + ( $(SET_X); \ + LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ + SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ - $$SHAREDCMD $(SHARED_LDFLAGS) $$SHAREDFLAGS -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ - $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \ - $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp ) + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ + $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ + ) && $(SYMLINK_SO); \ + ( $(SET_X); rm -f lib$(LIBNAME).exp ) + SYMLINK_SO= \ if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \ prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ if [ -n "$$SHLIB_COMPAT" ]; then \ for x in $$SHLIB_COMPAT; do \ - ( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \ + ( $(SET_X); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \ ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \ prev=$$SHLIB$$x$$SHLIB_SUFFIX; \ done; \ fi; \ if [ -n "$$SHLIB_SOVER" ]; then \ - ( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \ + ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ fi; \ fi LINK_SO_A= SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO) LINK_SO_O= SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO) + LINK_SO_A_VIA_O= \ SHOBJECTS=lib$(LIBNAME).o; \ ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \ - ( $(DEBUG); \ + ( $(SET_X); \ ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \ $(LINK_SO) && rm -f $(LIBNAME).o + LINK_SO_A_UNPACKED= \ UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \ (cd $$UNPACKDIR; ar x ../lib$(LIBNAME).a) && \ @@ -138,15 +149,11 @@ DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null DO_GNU_SO=$(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ - SHAREDCMD='$(CC)' -DO_GNU_APP=LDCMD=$(CC);\ - LDFLAGS="-Wl,-rpath,$(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME=$(APPNAME) + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" + +DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" #This is rather special. It's a special target with which one can link #applications without bothering with any features that have anything to @@ -154,10 +161,6 @@ DO_GNU_APP=LDCMD=$(CC);\ #libraries. It's mostly here to avoid a lot of conditionals everywhere #else... link_app.: - LDCMD=$(CC); \ - LDFLAGS=""; \ - LIBDEPS="$(LIBDEPS)"; \ - APPNAME="$(APPNAME)"; \ $(LINK_APP) link_o.gnu: @@ -167,16 +170,39 @@ link_a.gnu: link_app.gnu: @ $(DO_GNU_APP); $(LINK_APP) +link_o.bsd: + @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \ + $(CALC_VERSIONS); \ + SHLIB=lib$(LIBNAME).so; \ + SHLIB_SUFFIX=; \ + LIBDEPS=" "; \ + ALLSYMSFLAGS="-Wl,-Bforcearchive"; \ + NOALLSYMSFLAGS=; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \ + fi; $(LINK_SO_O) +link_a.bsd: + @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \ + $(CALC_VERSIONS); \ + SHLIB=lib$(LIBNAME).so; \ + SHLIB_SUFFIX=; \ + LIBDEPS=" "; \ + ALLSYMSFLAGS="-Wl,-Bforcearchive"; \ + NOALLSYMSFLAGS=; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \ + fi; $(LINK_SO_A) +link_app.bsd: + @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \ + LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBPATH)"; \ + fi; $(LINK_APP) + # For Darwin AKA Mac OS/X (dyld) link_o.darwin: @ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME); \ SHLIB_SUFFIX=.dylib; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-all_load'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-dynamiclib"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \ if [ -n "$(LIBVERSION)" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \ fi; \ @@ -188,11 +214,9 @@ link_a.darwin: @ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME); \ SHLIB_SUFFIX=.dylib; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-all_load'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-dynamiclib"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \ if [ -n "$(LIBVERSION)" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \ fi; \ @@ -200,42 +224,38 @@ link_a.darwin: SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \ fi; \ $(LINK_SO_A) -link_app.darwin: - LDCMD=$(CC);\ - LDFLAGS=""; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)"; \ +link_app.darwin: # is there run-path on darwin? $(LINK_APP) link_o.cygwin: @ $(CALC_VERSIONS); \ INHIBIT_SYMLINKS=yes; \ SHLIB=cyg$(LIBNAME); \ + expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \ SHLIB_SUFFIX=.dll; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - SHLIB_SOVER=-$(LIBVERSION); \ + LIBVERSION="$(LIBVERSION)"; \ + SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ - SHAREDCMD='${CC}'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ $(LINK_SO_O) link_a.cygwin: @ $(CALC_VERSIONS); \ INHIBIT_SYMLINKS=yes; \ SHLIB=cyg$(LIBNAME); \ + expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \ SHLIB_SUFFIX=.dll; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - SHLIB_SOVER=; \ + SHLIB_SOVER=-$(LIBVERSION); \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ - SHAREDCMD='${CC}'; \ - $(LINK_SO_A) + base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \ + [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \ + [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \ + $(LINK_SO_A) || exit 1; \ + cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX apps/; \ + cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX test/ link_app.cygwin: - LDCMD=$(CC);\ - LDFLAGS=""; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME).exe" $(LINK_APP) link_o.alpha-osf1: @@ -244,7 +264,6 @@ link_o.alpha-osf1: else \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ if [ -n "$$SHLIB_HIST" ]; then \ SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ @@ -254,8 +273,7 @@ link_o.alpha-osf1: SHLIB_SOVER=; \ ALLSYMSFLAGS='-all'; \ NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; \ if [ -n "$$SHLIB_HIST" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ fi; \ @@ -267,7 +285,6 @@ link_a.alpha-osf1: else \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ if [ -n "$$SHLIB_HIST" ]; then \ SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ @@ -277,139 +294,17 @@ link_a.alpha-osf1: SHLIB_SOVER=; \ ALLSYMSFLAGS='-all'; \ NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; \ if [ -n "$$SHLIB_HIST" ]; then \ SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ fi; \ fi; \ $(LINK_SO_A) link_app.alpha-osf1: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_APP); \ - else \ - LDCMD=$(CC);\ - LDFLAGS=""; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)" - fi; \ - $(LINK_APP) - -# The difference between alpha-osf1-shared and tru64-shared is the `-msym' -# option passed to the linker. -link_o.tru64: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_SO); \ - else \ - SHLIB=lib$(LIBNAME).so; \ - SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ - if [ -n "$$SHLIB_HIST" ]; then \ - SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ - else \ - SHLIB_HIST="$(LIBVERSION)"; \ - fi; \ - SHLIB_SOVER=; \ - ALLSYMSFLAGS='-all'; \ - NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \ - SHAREDCMD='$(CC)'; \ - if [ -n "$$SHLIB_HIST" ]; then \ - SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ - fi; \ - fi; \ - $(LINK_SO_O) -link_a.tru64: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_SO); \ - else \ - SHLIB=lib$(LIBNAME).so; \ - SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ - if [ -n "$$SHLIB_HIST" ]; then \ - SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ - else \ - SHLIB_HIST="$(LIBVERSION)"; \ - fi; \ - SHLIB_SOVER=; \ - ALLSYMSFLAGS='-all'; \ - NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \ - SHAREDCMD='$(CC)'; \ - if [ -n "$$SHLIB_HIST" ]; then \ - SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ - fi; \ - fi; \ - $(LINK_SO_A) -link_app.tru64: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_APP); \ - else \ - LDCMD=$(CC);\ - LDFLAGS="-rpath $(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)"; \ - fi; \ - $(LINK_APP) - -# The difference between tru64-shared and tru64-shared-rpath is the -# -rpath ${LIBRPATH} passed to the linker. -link_o.tru64-rpath: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_SO); \ - else \ - SHLIB=lib$(LIBNAME).so; \ - SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ - if [ -n "$$SHLIB_HIST" ]; then \ - SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ - else \ - SHLIB_HIST="$(LIBVERSION)"; \ - fi; \ - SHLIB_SOVER=; \ - ALLSYMSFLAGS='-all'; \ - NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \ - SHAREDCMD='$(CC)'; \ - if [ -n "$$SHLIB_HIST" ]; then \ - SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ - fi; \ - fi; \ - $(LINK_SO_O) -link_a.tru64-rpath: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_SO); \ - else \ - SHLIB=lib$(LIBNAME).so; \ - SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ - if [ -n "$$SHLIB_HIST" ]; then \ - SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \ - else \ - SHLIB_HIST="$(LIBVERSION)"; \ - fi; \ - SHLIB_SOVER=; \ - ALLSYMSFLAGS='-all'; \ - NOALLSYMSFLAGS='-none'; \ - SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \ - SHAREDCMD='$(CC)'; \ - if [ -n "$$SHLIB_HIST" ]; then \ - SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \ - fi; \ - fi; \ - $(LINK_SO_A) -link_app.tru64-rpath: - @ if ${DETECT_GNU_LD}; then \ + @if ${DETECT_GNU_LD}; then \ $(DO_GNU_APP); \ else \ - LDCMD=$(CC);\ - LDFLAGS="-rpath $(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)"; \ + LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \ fi; \ $(LINK_APP) @@ -419,14 +314,12 @@ link_o.solaris: else \ $(CALC_VERSIONS); \ MINUSZ='-z '; \ - (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \ + ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS="$${MINUSZ}allextract"; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ - SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH)"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ fi; \ $(LINK_SO_O) link_a.solaris: @@ -438,21 +331,16 @@ link_a.solaris: (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=;\ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS="$${MINUSZ}allextract"; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ - SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH)"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \ fi; \ $(LINK_SO_A) link_app.solaris: @ if ${DETECT_GNU_LD}; then \ $(DO_GNU_APP); \ else \ - LDCMD=$(CC);\ - LDFLAGS="-R $(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)"; \ + LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \ fi; \ $(LINK_APP) @@ -464,11 +352,9 @@ link_o.svr3: $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ fi; \ $(LINK_SO_O) link_a.svr3: @@ -478,22 +364,13 @@ link_a.svr3: $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ fi; \ $(LINK_SO_A_UNPACKED) link_app.svr3: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_APP); \ - else \ - LDCMD=$(CC);\ - LDFLAGS=""; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)"; \ - fi; \ + @${DETECT_GNU_LD} && $(DO_GNU_APP); \ $(LINK_APP) # UnixWare 7 and OpenUNIX 8 native compilers used @@ -503,14 +380,12 @@ link_o.svr5: else \ $(CALC_VERSIONS); \ SHARE_FLAG='-G'; \ - (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \ + ($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="$${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ fi; \ $(LINK_SO_O) link_a.svr5: @@ -522,22 +397,13 @@ link_a.svr5: (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=''; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="$${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ fi; \ $(LINK_SO_A_UNPACKED) link_app.svr5: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_APP); \ - else \ - LDCMD=$(CC);\ - LDFLAGS=""; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)"; \ - fi; \ + @${DETECT_GNU_LD} && $(DO_GNU_APP); \ $(LINK_APP) link_o.irix: @@ -547,13 +413,11 @@ link_o.irix: $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ MINUSWL=""; \ ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \ ALLSYMSFLAGS="$${MINUSWL}-all"; \ - NOALLSYMSFLAGS="$${MINUSWL}-notall"; \ - SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ - SHAREDCMD='$(CC)'; \ + NOALLSYMSFLAGS="$${MINUSWL}-none"; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ fi; \ $(LINK_SO_O) link_a.irix: @@ -563,150 +427,98 @@ link_a.irix: $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ MINUSWL=""; \ ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \ ALLSYMSFLAGS="$${MINUSWL}-all"; \ - NOALLSYMSFLAGS="$${MINUSWL}-notall"; \ - SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \ - SHAREDCMD='$(CC)'; \ + NOALLSYMSFLAGS="$${MINUSWL}-none"; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ fi; \ $(LINK_SO_A) link_app.irix: - @ if ${DETECT_GNU_LD}; then \ - $(DO_GNU_APP); \ - else \ - LDCMD=$(CC);\ - LDFLAGS="-Wl,-rpath,$(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)"; \ - fi; \ - $(LINK_APP) - -# HP-UX includes the full pathname of libs we depend on, so we would get -# ./libcrypto (with ./ as path information) compiled into libssl, hence -# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto -# anyway. -# The object modules are loaded from lib$i.a using the undocumented -Fl -# option. -# -# WARNING: Until DSO is fixed to support a search path, we support SHLIB_PATH -# by temporarily specifying "+s"! -# -link_o.hpux32: - @ $(CALC_VERSIONS); \ - SHLIB=lib$(LIBNAME).sl; \ - SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - ALLSYMSFLAGS='-Fl'; \ - NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \ - SHAREDCMD='/usr/ccs/bin/ld'; \ - $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -link_a.hpux32: - @ $(CALC_VERSIONS); \ - SHLIB=lib$(LIBNAME).sl; \ - SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - ALLSYMSFLAGS='-Fl'; \ - NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \ - SHAREDCMD='/usr/ccs/bin/ld'; \ - $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -link_app.hpux32: - LDCMD=$(CC);\ - LDFLAGS="-Wl,+b,$(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)" + @LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \ $(LINK_APP) -# HP-UX includes the full pathname of libs we depend on, so we would get -# ./libcrypto (with ./ as path information) compiled into libssl, hence -# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto -# anyway. -# -# HP-UX in 64bit mode has "+s" enabled by default; it will search for -# shared libraries along LD_LIBRARY_PATH _and_ SHLIB_PATH. +# 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so +# we compensate for it with +cdp ../: and +cdp ./:. Yes, these rewrite +# rules imply that we can only link one level down in catalog structure, +# but that's what takes place for the moment of this writing. +cdp option +# was introduced in HP-UX 11.x and applies in 32-bit PA-RISC link +# editor context only [it's simply ignored in other cases, which are all +# ELFs by the way]. # -link_o.hpux64: - @ $(CALC_VERSIONS); \ +link_o.hpux: + @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \ + $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).sl; \ + expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - ALLSYMSFLAGS='+forceload'; \ + ALLSYMSFLAGS='-Wl,-Fl'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \ - SHAREDCMD='/usr/ccs/bin/ld'; \ + expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ + fi; \ + rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \ $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -link_a.hpux64: - @ $(CALC_VERSIONS); \ +link_a.hpux: + @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \ + $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).sl; \ + expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - ALLSYMSFLAGS='+forceload'; \ + ALLSYMSFLAGS='-Wl,-Fl'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS="-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \ - SHAREDCMD='/usr/ccs/bin/ld'; \ + expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \ + fi; \ + rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \ $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -link_app.hpux64: - LDCMD=$(CC);\ - LDFLAGS="-Wl,+b,$(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)" +link_app.hpux: + @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \ + LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \ + fi; \ $(LINK_APP) link_o.aix: @ $(CALC_VERSIONS); \ + OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]\([0-9]*\)'`; \ + OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-bnogc'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \ - SHAREDCMD='$(CC)'; \ - $(LINK_SO_O) + SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE'; \ + $(LINK_SO_O); rm -rf lib$(LIBNAME).exp link_a.aix: @ $(CALC_VERSIONS); \ + OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]\([0-9]*\)'`; \ + OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS='-bnogc'; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE'; \ $(LINK_SO_A_VIA_O) link_app.aix: - LDCMD=$(CC);\ - LDFLAGS="-blibpath:$(LIBRPATH)"; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)" + LDFLAGS="$(CFLAGS) -blibpath:$(LIBRPATH)"; \ $(LINK_APP) link_o.reliantunix: @ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='-G'; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS='$(CFLAGS) -G'; \ $(LINK_SO_O) link_a.reliantunix: @ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ - LIBDEPS="$(LIBDEPS) -lc"; \ ALLSYMSFLAGS=; \ NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='-G'; \ - SHAREDCMD='$(CC)'; \ + SHAREDFLAGS='$(CFLAGS) -G'; \ $(LINK_SO_A_UNPACKED) link_app.reliantunix: - LDCMD=$(CC);\ - LDFLAGS=""; \ - LIBDEPS="$(LIBDEPS) -lc"; \ - APPNAME="$(APPNAME)" $(LINK_APP) # Targets to build symbolic links when needed @@ -720,9 +532,10 @@ symlink.darwin: SHLIB=lib$(LIBNAME); \ SHLIB_SUFFIX=.dylib; \ $(SYMLINK_SO) -symlink.hpux32 symlink.hpux64: +symlink.hpux: @ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).sl; \ + expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \ $(SYMLINK_SO) # The following lines means those specific architectures do no symlinks symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath: @@ -731,7 +544,10 @@ symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath: link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu -symlink.bsd-gcc-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu +symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu +link_o.bsd-shared: link_o.bsd +link_a.bsd-shared: link_a.bsd +link_app.bsd-shared: link_app.bsd link_o.darwin-shared: link_o.darwin link_a.darwin-shared: link_a.darwin link_app.darwin-shared: link_app.darwin @@ -768,14 +584,10 @@ link_o.irix-shared: link_o.irix link_a.irix-shared: link_a.irix link_app.irix-shared: link_app.irix symlink.irix-shared: symlink.irix -link_o.hpux-shared: link_o.hpux32 -link_a.hpux-shared: link_a.hpux32 -link_app.hpux-shared: link_app.hpux32 -symlink.hpux-shared: symlink.hpux32 -link_o.hpux64-shared: link_o.hpux64 -link_a.hpux64-shared: link_a.hpux64 -link_app.hpux64-shared: link_app.hpux64 -symlink.hpux64-shared: symlink.hpux64 +link_o.hpux-shared: link_o.hpux +link_a.hpux-shared: link_a.hpux +link_app.hpux-shared: link_app.hpux +symlink.hpux-shared: symlink.hpux link_o.aix-shared: link_o.aix link_a.aix-shared: link_a.aix link_app.aix-shared: link_app.aix