Skip to content

Commit 9892626

Browse files
committed
try again
1 parent a44dff9 commit 9892626

File tree

1 file changed

+42
-15
lines changed

1 file changed

+42
-15
lines changed

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

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -228,27 +228,54 @@ ifneq ($(OPENSSL_BUNDLE_LIB_PATH), )
228228
endif
229229

230230
LIBCRYPTO_TARGET_LIB := $(LIB_DST_DIR)/$(notdir $(LIBCRYPTO_PATH))
231-
LIBCRYPTO_RENAMED_TARGET_LIB :=
231+
TARGETS += $(LIBCRYPTO_TARGET_LIB)
232+
$(LIBCRYPTO_TARGET_LIB) : $(LIBCRYPTO_PATH)
233+
$(call install-file)
232234
ifeq (linux,$(OPENJDK_TARGET_OS))
233-
LIBCRYPTO_RENAMED_TARGET_LIB += $((dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.so)
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))libopenssl-semeru.so
239+
@ls -al $(dir $(LIBCRYPTO_TARGET_LIB))
240+
@$(ECHO) Renamed library $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.so
241+
@$(ECHO) OpenSSL Rename Stuff Done
242+
@$(ECHO) Do code signing file
243+
$(call CodesignFile,"$(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.so")
244+
@$(ECHO) Do code signing file DONE
234245
else ifeq (macosx,$(OPENJDK_TARGET_OS))
235-
LIBCRYPTO_RENAMED_TARGET_LIB += $((dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dylib)
236-
else ifeq (windows,$(OPENJDK_TARGET_OS))
237-
LIBCRYPTO_RENAMED_TARGET_LIB += $((dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dll)
238-
endif
239-
240-
TARGETS += $(LIBCRYPTO_RENAMED_TARGET_LIB)
241-
$(LIBCRYPTO_RENAMED_TARGET_LIB) : $(LIBCRYPTO_PATH)
242-
@$(ECHO) Renaming OpenSSL Library Target $(LIBCRYPTO_RENAMED_TARGET_LIB)
246+
@$(ECHO) Renaming OpenSSL Library Target MacOS $(LIBCRYPTO_TARGET_LIB)
243247
@$(ECHO) LIBCRYPTO_PATH $(LIBCRYPTO_PATH)
244-
$(call install-file)
245-
ifeq (macosx,$(OPENJDK_TARGET_OS))
248+
@$(ECHO) LIBCRYPTO_PATH DIRECTORY $(dir $(LIBCRYPTO_TARGET_LIB))
249+
$(MV) -v $(LIBCRYPTO_TARGET_LIB) $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dylib
250+
@ls -al $(dir $(LIBCRYPTO_TARGET_LIB))
251+
@$(ECHO) Renamed library $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dylib
252+
@$(ECHO) OpenSSL Rename Stuff Done
246253
# update @rpath of the crypto library as the default is /usr/local/lib/
247-
install_name_tool -id "@rpath/$(@F)" $@
254+
@$(ECHO) Setting RPATH For MAC Crypto Library
255+
@$(ECHO) rpath $((dir $((LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dylib)F)
256+
@$(ECHO) at $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dylib
257+
install_name_tool -id "@rpath/libopenssl-semeru.dylib" $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dylib
258+
@$(ECHO) Setting RPATH For MAC Crypto Library DONE
259+
@$(ECHO) Do code signing file
260+
$(call CodesignFile,"$(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dylib")
261+
@$(ECHO) Do code signing file DONE
248262
else ifeq (windows,$(OPENJDK_TARGET_OS))
249-
$(CHMOD) a+rx $@
263+
@$(ECHO) Renaming OpenSSL Library Target Windows $(LIBCRYPTO_TARGET_LIB)
264+
@$(ECHO) LIBCRYPTO_PATH $(LIBCRYPTO_PATH)
265+
@$(ECHO) LIBCRYPTO_PATH DIRECTORY $(dir $(LIBCRYPTO_TARGET_LIB))
266+
$(MV) -v $(LIBCRYPTO_TARGET_LIB) $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dll
267+
@ls -al $(dir $(LIBCRYPTO_TARGET_LIB))
268+
@$(ECHO) Renamed library $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dll
269+
@$(ECHO) OpenSSL Rename Stuff Done
270+
@$(ECHO) Setting Permissions bits Windows
271+
@$(ECHO) at $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dll
272+
$(CHMOD) a+rx $(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dll
273+
@$(ECHO) Setting Permissions bits Windows DONE
274+
@$(ECHO) Do code signing file
275+
$(call CodesignFile,"$(dir $(LIBCRYPTO_TARGET_LIB))libopenssl-semeru.dll")
276+
@$(ECHO) Do code signing file DONE
250277
endif
251-
$(call CodesignFile,"$@")
278+
252279

253280
ifeq (true,$(OPENJ9_ENABLE_JITSERVER))
254281
ifeq (linux,$(OPENJDK_TARGET_OS))

0 commit comments

Comments
 (0)