Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8277429: Conflicting jpackage static library name #6485

Closed
wants to merge 1 commit into from
Closed

8277429: Conflicting jpackage static library name #6485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions make/modules/jdk.jpackage/Lib.gmk
View file
Open in desktop
Expand Up @@ -92,9 +92,9 @@ ifeq ($(call isTargetOs, linux), true)
JPACKAGE_LIBAPPLAUNCHER_INCLUDES := $(addprefix -I, $(JPACKAGE_LIBAPPLAUNCHER_SRC))

$(eval $(call SetupJdkLibrary, BUILD_JPACKAGE_LIBAPPLAUNCHER, \
NAME := jpackageapplauncher, \
NAME := jpackageapplauncheraux, \
OUTPUT_DIR := $(JPACKAGE_OUTPUT_DIR), \
SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjpackageapplauncher, \
SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjpackageapplauncheraux, \
SRC := $(JPACKAGE_LIBAPPLAUNCHER_SRC), \
EXCLUDE_FILES := LinuxLauncher.c LinuxPackage.c, \
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
View file
Open in desktop
Expand Up @@ -101,7 +101,7 @@ public void prepareApplicationFiles(Map<String, ? super Object> params)
private void createLauncherLib() throws IOException {
Path path = appLayout.pathGroup().getPath(
ApplicationLayout.PathRole.LINUX_APPLAUNCHER_LIB);
try (InputStream resource = getResourceAsStream("libjpackageapplauncher.so")) {
try (InputStream resource = getResourceAsStream("libjpackageapplauncheraux.so")) {
writeEntry(resource, path);
}

Expand Down