mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 10:56:56 +00:00
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
diff -rc openssl-0.9.7h-orig/Makefile.org openssl-0.9.7h/Makefile.org
|
|
*** openssl-0.9.7h-orig/Makefile.org 2005-06-20 06:29:54.000000000 +0200
|
|
--- openssl-0.9.7h/Makefile.org 2005-10-12 09:38:00.000000000 +0200
|
|
***************
|
|
*** 258,264 ****
|
|
libcrypto$(SHLIB_EXT): libcrypto.a
|
|
@if [ "$(SHLIB_TARGET)" != "" ]; then \
|
|
$(MAKE) SHLIBDIRS=crypto build-shared; \
|
|
! if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
|
|
fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \
|
|
fi; \
|
|
else \
|
|
--- 258,264 ----
|
|
libcrypto$(SHLIB_EXT): libcrypto.a
|
|
@if [ "$(SHLIB_TARGET)" != "" ]; then \
|
|
$(MAKE) SHLIBDIRS=crypto build-shared; \
|
|
! if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
|
|
fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \
|
|
fi; \
|
|
else \
|
|
***************
|
|
*** 325,331 ****
|
|
if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
|
|
libs="$(LIBKRB5) $$libs"; \
|
|
fi; \
|
|
! ( set -x; ${CC} ${SHARED_LDFLAGS}
|
|
--verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
|
|
lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
|
-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
|
|
--- 325,331 ----
|
|
if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
|
|
libs="$(LIBKRB5) $$libs"; \
|
|
fi; \
|
|
! ( set -x; ${CC} ${SHARED_LDFLAGS} \
|
|
--verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
|
|
lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
|
-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
|