8211362: Restrict export of libjpeg symbols from libjavafx_iio.so

Backport-of: ed5cfe72e0da4e4b90eb83cac7c50fe761f28c04
openjdk · Aug 31, 2021 · 319d2f0 · 319d2f0 · openjdk-notifier · Aug 31, 2021
1 parent f9a00e6
commit 319d2f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
@@ -299,8 +299,8 @@ LINUX.iio.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),
     file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
 LINUX.iio.compiler = compiler
-LINUX.iio.ccFlags = [cFlags].flatten()
-LINUX.iio.linker = linker
+LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten()
+LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker
 LINUX.iio.linkFlags = [linkFlags].flatten()
 LINUX.iio.lib = "javafx_iio"
 

diff --git a/buildSrc/src/main/groovy/com/sun/javafx/gradle/LinkTask.groovy b/buildSrc/src/main/groovy/com/sun/javafx/gradle/LinkTask.groovy
@@ -42,8 +42,13 @@ class LinkTask extends DefaultTask {
         project.exec({
             commandLine(linker);
             if ((project.IS_LINUX) && (project.IS_STATIC_BUILD)) {
-              args("rcs");
-              args("$lib");
+                if (linker.equals("ld")) {
+                    args("-r");
+                    args("-o");
+                } else {
+                    args("rcs");
+                }
+                args("$lib");
             }
             // Exclude parfait files (.bc)
             args(objectDir.listFiles().findAll{ !it.getAbsolutePath().endsWith(".bc") });