Skip to content

Commit 88139b0

Browse files
jasonkatonicajasonkatonica
committed
Try fresh with different target library
1 parent b5a0f0b commit 88139b0

File tree

2 files changed

+5
-61
lines changed

2 files changed

+5
-61
lines changed

‎closed/autoconf/custom-hook.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,9 +704,7 @@ AC_DEFUN([CONFIGURE_OPENSSL],
704704
if test "x$BUNDLE_OPENSSL" = xyes ; then
705705
# On Mac OSX, create local copy of the crypto library to update @rpath
706706
# as the default is /usr/local/lib.
707-
$ECHO HERE ABOUT TO CHECK MAC
708707
if test "x$OPENJDK_BUILD_OS" = xmacosx ; then
709-
$ECHO HERE2.1 YES ON MAC
710708
LOCAL_CRYPTO="$TOPDIR/openssl"
711709
$MKDIR -p "${LOCAL_CRYPTO}"
712710
$CP "${OPENSSL_DIR}/libcrypto.1.1.dylib" "${LOCAL_CRYPTO}"
@@ -722,9 +720,7 @@ AC_DEFUN([CONFIGURE_OPENSSL],
722720
if test "x$BUNDLE_OPENSSL" = xyes ; then
723721
# On Mac OSX, create local copy of the crypto library to update @rpath
724722
# as the default is /usr/local/lib.
725-
$ECHO HERE2 ABOUT TO CHECK MAC
726723
if test "x$OPENJDK_BUILD_OS" = xmacosx ; then
727-
$ECHO HERE2.1 YES ON MAC
728724
LOCAL_CRYPTO="$TOPDIR/openssl"
729725
$MKDIR -p "${LOCAL_CRYPTO}"
730726
$CP "${OPENSSL_DIR}/libcrypto.1.1.dylib" "${LOCAL_CRYPTO}"

‎closed/custom/modules/java.base/Copy.gmk

Lines changed: 5 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -227,66 +227,17 @@ ifneq ($(OPENSSL_BUNDLE_LIB_PATH), )
227227
$(error Cannot bundle OpenSSL - none of $(LIBCRYPTO_NAMES) are present in $(OPENSSL_BUNDLE_LIB_PATH))
228228
endif
229229

230-
LIBCRYPTO_TARGET_LIB := $(LIB_DST_DIR)/$(notdir $(LIBCRYPTO_PATH))
230+
LIBCRYPTO_TARGET_LIB := $(LIB_DST_DIR)/$(LIBRARY_PREFIX)crypto-semeru$(SHARED_LIBRARY_SUFFIX)
231231
TARGETS += $(LIBCRYPTO_TARGET_LIB)
232232
$(LIBCRYPTO_TARGET_LIB) : $(LIBCRYPTO_PATH)
233233
$(call install-file)
234-
ifeq (linux,$(OPENJDK_TARGET_OS))
235-
@$(ECHO) Renaming OpenSSL Library Target Linux $(LIBCRYPTO_TARGET_LIB)
236-
@$(ECHO) LIBCRYPTO_PATH $(LIBCRYPTO_PATH)
237-
@$(ECHO) LIBCRYPTO_PATH DIRECTORY $(dir $(LIBCRYPTO_TARGET_LIB))
238-
$(MV) -v $(LIBCRYPTO_TARGET_LIB) $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.so
239-
@ls -al $(dir $(LIBCRYPTO_TARGET_LIB))
240-
@$(ECHO) Renamed library $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.so
241-
@$(ECHO) OpenSSL Rename Stuff Done
242-
@$(ECHO) Do code signing file
243-
$(call CodesignFile,"$(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.so")
244-
@$(ECHO) Do code signing file DONE
245-
else ifeq (aix,$(OPENJDK_TARGET_OS))
246-
@$(ECHO) Renaming OpenSSL Library Target AIX $(LIBCRYPTO_TARGET_LIB)
247-
@$(ECHO) LIBCRYPTO_PATH $(LIBCRYPTO_PATH)
248-
@$(ECHO) LIBCRYPTO_PATH DIRECTORY $(dir $(LIBCRYPTO_TARGET_LIB))
249-
$(MV) -v $(LIBCRYPTO_TARGET_LIB) $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.so
250-
@ls -al $(dir $(LIBCRYPTO_TARGET_LIB))
251-
@$(ECHO) Renamed library $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.so
252-
@$(ECHO) OpenSSL Rename Stuff Done
253-
@$(ECHO) Do code signing file
254-
$(call CodesignFile,"$(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.so")
255-
@$(ECHO) Do code signing file DONE
256-
else ifeq (macosx,$(OPENJDK_TARGET_OS))
257-
@$(ECHO) Renaming OpenSSL Library Target MacOS $(LIBCRYPTO_TARGET_LIB)
258-
@$(ECHO) LIBCRYPTO_PATH $(LIBCRYPTO_PATH)
259-
@$(ECHO) LIBCRYPTO_PATH DIRECTORY $(dir $(LIBCRYPTO_TARGET_LIB))
260-
$(MV) -v $(LIBCRYPTO_TARGET_LIB) $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dylib
261-
@ls -al $(dir $(LIBCRYPTO_TARGET_LIB))
262-
@$(ECHO) Renamed library $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dylib
263-
@$(ECHO) OpenSSL Rename Stuff Done
264-
@$(ECHO) Setting RPATH For MAC Crypto Library
265-
@$(ECHO) rpath $((dir $((LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dylib)F)
266-
@$(ECHO) at $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dylib
234+
ifeq (macosx,$(OPENJDK_TARGET_OS))
267235
# update @rpath of the crypto library as the default is /usr/local/lib/
268-
install_name_tool -id "@rpath/libcrypto-semeru.dylib" $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dylib
269-
@$(ECHO) Setting RPATH For MAC Crypto Library DONE
270-
@$(ECHO) Do code signing file
271-
$(call CodesignFile,"$(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dylib")
272-
@$(ECHO) Do code signing file DONE
236+
install_name_tool -id "@rpath/$(@F)" $@
273237
else ifeq (windows,$(OPENJDK_TARGET_OS))
274-
@$(ECHO) Renaming OpenSSL Library Target Windows $(LIBCRYPTO_TARGET_LIB)
275-
@$(ECHO) LIBCRYPTO_PATH $(LIBCRYPTO_PATH)
276-
@$(ECHO) LIBCRYPTO_PATH DIRECTORY $(dir $(LIBCRYPTO_TARGET_LIB))
277-
$(MV) -v $(LIBCRYPTO_TARGET_LIB) $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dll
278-
@ls -al $(dir $(LIBCRYPTO_TARGET_LIB))
279-
@$(ECHO) Renamed library $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dll
280-
@$(ECHO) OpenSSL Rename Stuff Done
281-
@$(ECHO) Setting Permissions bits Windows
282-
@$(ECHO) at $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dll
283-
$(CHMOD) a+rx $(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dll
284-
@$(ECHO) Setting Permissions bits Windows DONE
285-
@$(ECHO) Do code signing file
286-
$(call CodesignFile,"$(dir $(LIBCRYPTO_TARGET_LIB))libcrypto-semeru.dll")
287-
@$(ECHO) Do code signing file DONE
238+
$(CHMOD) a+rx $@
288239
endif
289-
240+
$(call CodesignFile,"$@")
290241

291242
ifeq (true,$(OPENJ9_ENABLE_JITSERVER))
292243
ifeq (linux,$(OPENJDK_TARGET_OS))
@@ -297,9 +248,6 @@ ifneq ($(OPENSSL_BUNDLE_LIB_PATH), )
297248
LIBSSL_TARGET_LIB = $(LIB_DST_DIR)/$(notdir $(LIBSSL_PATH))
298249
TARGETS += $(LIBSSL_TARGET_LIB)
299250
$(LIBSSL_TARGET_LIB) : $(LIBSSL_PATH)
300-
@$(ECHO) Renaming libssl library
301-
@$(ECHO) LIBSSL_TARGET_LIB $(LIBSSL_TARGET_LIB)
302-
@$(ECHO) LIBSSL_PATH $(LIBSSL_PATH)
303251
$(call install-file)
304252
$(call CodesignFile,"$@")
305253
endif # LIBSSL_PATH

0 commit comments

Comments
 (0)