diff options
| author |   djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
| commit | 4fcf65c5c59fcf6124cf9f1fd81aa546850f974c (patch) | |
| tree | 3c0b4c46d91bcb87c8eef7a1e84711159b17f71b /lib/libssl/src/shlib | |
| parent | import of OpenSSL 0.9.8h (diff) | |
| download | wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.tar.xz wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.zip | |
resolve conflicts
Diffstat (limited to 'lib/libssl/src/shlib')
| -rw-r--r-- | lib/libssl/src/shlib/Makefile.hpux10-cc | 2 | ||||
| -rw-r--r-- | lib/libssl/src/shlib/hpux10-cc.sh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/src/shlib/Makefile.hpux10-cc b/lib/libssl/src/shlib/Makefile.hpux10-cc index 4d2d19bcf2f..89c28dcf462 100644 --- a/lib/libssl/src/shlib/Makefile.hpux10-cc +++ b/lib/libssl/src/shlib/Makefile.hpux10-cc @@ -1,6 +1,6 @@ # Makefile.hpux-cc -major=0.9.7 +major=0.9.8 slib=libssl sh_slib=$(slib).sl.$(major) diff --git a/lib/libssl/src/shlib/hpux10-cc.sh b/lib/libssl/src/shlib/hpux10-cc.sh index fcadda827d7..ceeb8c5236c 100644 --- a/lib/libssl/src/shlib/hpux10-cc.sh +++ b/lib/libssl/src/shlib/hpux10-cc.sh @@ -60,9 +60,9 @@ mkdir /usr/local mkdir /usr/local/ssl mkdir /usr/local/ssl/lib chmod 444 lib*_pic.a -chmod 555 lib*.sl.0.9.7 -cp -p lib*_pic.a lib*.sl.0.9.7 /usr/local/ssl/lib -(cd /usr/local/ssl/lib ; ln -sf libcrypto.sl.0.9.7 libcrypto.sl ; ln -sf libssl.sl.0.9.7 libssl.sl) +chmod 555 lib*.sl.0.9.8 +cp -p lib*_pic.a lib*.sl.0.9.8 /usr/local/ssl/lib +(cd /usr/local/ssl/lib ; ln -sf libcrypto.sl.0.9.8 libcrypto.sl ; ln -sf libssl.sl.0.9.8 libssl.sl) # Reconfigure without pic to compile the executables. Unfortunately, while # performing this task we have to recompile the library components, even @@ -74,9 +74,9 @@ make clean # Hack the Makefiles to pick up the dynamic libraries during linking # -sed 's/^PEX_LIBS=.*$/PEX_LIBS=-L\/usr\/local\/ssl\/lib/' Makefile >xxx; mv xxx Makefile.ssl -sed 's/-L\.\.//' apps/Makefile >xxx; mv xxx apps/Makefile -sed 's/-L\.\.//' test/Makefile >xxx; mv xxx test/Makefile +sed 's/^PEX_LIBS=.*$/PEX_LIBS=-L\/usr\/local\/ssl\/lib/' Makefile.ssl >xxx; mv xxx Makefile.ssl +sed 's/-L\.\.//' apps/Makefile.ssl >xxx; mv xxx apps/Makefile.ssl +sed 's/-L\.\.//' test/Makefile.ssl >xxx; mv xxx test/Makefile.ssl # Build the static libs and the executables in one make. make # Install everything |