Commit 1a83c372 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Unified hpux-shared rule. Verified with both 32- and 64-bit builds and 

both vendor and GNU compilers. ./engine shared build are still busted.
I mean always were...
parent 674ee8b7

Makefile.shared

+10 −49
Original line number Diff line number Diff line
@@ -593,70 +593,35 @@ link_app.irix: 
# WARNING: Until DSO is fixed to support a search path, we support SHLIB_PATH

#          by temporarily specifying "+s"!

#

link_o.hpux32:

link_o.hpux:

	@ $(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).sl; \

	SHLIB_SUFFIX=; \

	LIBDEPS="$(LIBDEPS)"; \

	ALLSYMSFLAGS='-Wl,-Fl'; \

	NOALLSYMSFLAGS=''; \

	expr $(PLATFORM) : '.*64' > /dev/null && ALLSYMFLAGS='-Wl,+forceload'; \

	expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \

	SHAREDFLAGS="-Wl,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \

	SHAREDCMD=$(CC); \

	$(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX

link_a.hpux32:

link_a.hpux:

	@ $(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).sl; \

	SHLIB_SUFFIX=; \

	LIBDEPS="$(LIBDEPS)"; \

	ALLSYMSFLAGS='-Wl,-Fl'; \

	NOALLSYMSFLAGS=''; \

	expr $(PLATFORM) : '.*64' > /dev/null && ALLSYMFLAGS='-Wl,+forceload'; \

	expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \

	SHAREDFLAGS="-Wl,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \

	SHAREDCMD='$(CC)'; \

	$(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX

link_app.hpux32:

link_app.hpux:

	LDCMD=$(CC);\

	LDFLAGS="-Wl,+b,$(LIBRPATH)"; \

	LIBDEPS="$(LIBDEPS)"; \

	APPNAME="$(APPNAME)"; \

	$(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.

#

link_o.hpux64:

	@ $(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).sl; \

	SHLIB_SUFFIX=; \

	LIBDEPS="$(LIBDEPS) -lc"; \

	ALLSYMSFLAGS='+forceload'; \

	NOALLSYMSFLAGS=''; \

	SHAREDFLAGS="-b -z +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.hpux64:

	@ $(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).sl; \

	SHLIB_SUFFIX=; \

	LIBDEPS="$(LIBDEPS) -lc"; \

	ALLSYMSFLAGS='+forceload'; \

	NOALLSYMSFLAGS=''; \

	SHAREDFLAGS="-b -z +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.hpux64:

	LDCMD=$(CC);\

	LDFLAGS="-Wl,+b,$(LIBRPATH)"; \

	LIBDEPS="$(LIBDEPS) -lc"; \

	APPNAME="$(APPNAME)"

	$(LINK_APP)



link_o.aix:

	@ $(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).so; \
@@ -722,7 +687,7 @@ symlink.darwin: 
	SHLIB=lib$(LIBNAME); \

	SHLIB_SUFFIX=.dylib; \

	$(SYMLINK_SO)

symlink.hpux32 symlink.hpux64:

symlink.hpux:

	@ $(CALC_VERSIONS); \

	SHLIB=lib$(LIBNAME).sl; \

	$(SYMLINK_SO)
@@ -770,14 +735,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

TABLE

+19 −19
Original line number Diff line number Diff line
@@ -2270,7 +2270,7 @@ $rc5_obj = 
$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = +Z

$shared_ldflag = 

$shared_ldflag = -b

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2295,7 +2295,7 @@ $rc5_obj = 
$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_ldflag = -shared

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2320,7 +2320,7 @@ $rc5_obj = 
$dso_scheme   = dlfcn

$shared_target= hpux-shared

$shared_cflag = +Z

$shared_ldflag = 

$shared_ldflag = +DD32 -b

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2345,7 +2345,7 @@ $rc5_obj = 
$dso_scheme   = dlfcn

$shared_target= hpux-shared

$shared_cflag = -fpic

$shared_ldflag = 

$shared_ldflag = -shared

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2395,7 +2395,7 @@ $rc5_obj = 
$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = +Z

$shared_ldflag = 

$shared_ldflag = -b

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2420,7 +2420,7 @@ $rc5_obj = 
$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = +Z

$shared_ldflag = 

$shared_ldflag = -b

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2445,7 +2445,7 @@ $rc5_obj = 
$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_ldflag = -shared

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2470,7 +2470,7 @@ $rc5_obj = 
$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = +Z

$shared_ldflag = 

$shared_ldflag = -b

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2495,7 +2495,7 @@ $rc5_obj = 
$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = +Z

$shared_ldflag = 

$shared_ldflag = -b

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2520,7 +2520,7 @@ $rc5_obj = 
$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_ldflag = -shared

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2643,9 +2643,9 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= hpux64-shared

$shared_target= hpux-shared

$shared_cflag = +Z

$shared_ldflag = 

$shared_ldflag = +DD64 -b

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2670,7 +2670,7 @@ $rc5_obj = 
$dso_scheme   = dlfcn

$shared_target= hpux-shared

$shared_cflag = -fpic

$shared_ldflag = 

$shared_ldflag = -mlp64 -shared

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2693,9 +2693,9 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= hpux64-shared

$shared_target= hpux-shared

$shared_cflag = -fpic

$shared_ldflag = 

$shared_ldflag = -shared

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2718,9 +2718,9 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= hpux64-shared

$shared_target= hpux-shared

$shared_cflag = +Z

$shared_ldflag = 

$shared_ldflag = +DD64 -b

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =
@@ -2743,9 +2743,9 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= hpux64-shared

$shared_target= hpux-shared

$shared_cflag = -fpic

$shared_ldflag = 

$shared_ldflag = -shared

$shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      =