summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2004-05-31 14:50:19 +0000
committerAndy Polyakov <appro@openssl.org>2004-05-31 14:50:19 +0000
commitbc1ca8605c1c57723a6de90857fbc46c2e486acc (patch)
treeead3e17397bc83aa311f94239f3237823f2b7071
parentad5003409d8fde40582e97b38dd34407b6195937 (diff)
Working on HP-UX shared support...
-rw-r--r--Makefile.shared6
-rw-r--r--apps/Makefile.ssl2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.shared b/Makefile.shared
index 57e4ad334d..5d8692add4 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -602,7 +602,7 @@ link_o.hpux:
ALLSYMSFLAGS='-Wl,-Fl'; \
NOALLSYMSFLAGS=''; \
expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
- SHAREDFLAGS="-Wl,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \
+ SHAREDFLAGS="-Wl,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \
SHAREDCMD=$(CC); \
fi; \
$(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
@@ -615,14 +615,14 @@ link_a.hpux:
ALLSYMSFLAGS='-Wl,-Fl'; \
NOALLSYMSFLAGS=''; \
expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
- SHAREDFLAGS="-Wl,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \
+ SHAREDFLAGS="-Wl,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \
SHAREDCMD='$(CC)'; \
fi; \
$(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
link_app.hpux:
@if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
LDCMD=$(CC);\
- LDFLAGS="-Wl,+b,$(LIBRPATH)"; \
+ LDFLAGS="-Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \
LIBDEPS="$(LIBDEPS)"; \
APPNAME="$(APPNAME)"; \
fi; \
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 8e5c01d4ea..90225904be 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -156,7 +156,7 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
shlib_target="$(SHLIB_TARGET)"; \
fi; \
- if [ "$${shlib_target}" = "hpux-shared" -o "$${shlib_target}" = "darwin-shared" ] ; then \
+ if [ "$${shlib_target}" = "darwin-shared" ] ; then \
LIBRARIES="$(DLIBSSL) $(LIBKRB5) $(DLIBCRYPTO)" ; \
else \
LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \