8210924: Remove PACKAGE_PATH

magicus · magicus · commit fe67f09af390 · 2018-09-20T00:19:46.000+02:00
Reviewed-by: tbell
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
@@ -357,8 +357,6 @@ ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
 LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
 GRAALUNIT_LIB := @GRAALUNIT_LIB@
 
-PACKAGE_PATH=@PACKAGE_PATH@
-
 # Source file for cacerts
 CACERTS_FILE=@CACERTS_FILE@
 
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
@@ -996,11 +996,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
 # Do some additional checks on the detected tools.
 AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
 [
-  # The package path is used only on macosx?
-  # FIXME: clean this up, and/or move it elsewhere.
-  PACKAGE_PATH=/opt/local
-  AC_SUBST(PACKAGE_PATH)
-
   # Check for extra potential brokenness.
   if test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     # On Windows, double-check that we got the right compiler.
diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk
@@ -128,7 +128,6 @@ define SetupBuildLauncherBody
       $1_PLIST_FILE := Info-cmdline.plist
     endif
 
-    $1_CFLAGS += -DPACKAGE_PATH='"$(PACKAGE_PATH)"'
     $1_LDFLAGS += -Wl,-all_load \
         -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE)
     ifeq ($(STATIC_BUILD), true)
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
@@ -292,7 +292,6 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx), )
         #
 
     LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
-        -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
         $(FONTCONFIG_CFLAGS) \
         $(CUPS_CFLAGS)
 
@@ -459,7 +458,7 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
       #
 
   LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \
-      -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+      -DHEADLESS=true
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
       NAME := awt_headless, \
diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
@@ -202,8 +202,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
   BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
-
-  LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
diff --git a/src/java.base/macosx/native/libjli/java_md_macosx.h b/src/java.base/macosx/native/libjli/java_md_macosx.h
@@ -38,7 +38,6 @@ int64_t CounterGet(void);
  *      A collection of useful strings. One should think of these as #define
  *      entries, but actual strings can be more efficient (with many compilers).
  */
-static const char *system_dir  = PACKAGE_PATH "/openjdk7";
 static const char *user_dir    = "/java";
 
 #include <dlfcn.h>
diff --git a/src/java.base/unix/native/libjli/java_md_solinux.h b/src/java.base/unix/native/libjli/java_md_solinux.h
@@ -46,10 +46,8 @@ extern char **environ;
  *      entries, but actual strings can be more efficient (with many compilers).
  */
 #ifdef __solaris__
-static const char *system_dir   = "/usr/jdk";
 static const char *user_dir     = "/jdk";
 #else /* !__solaris__, i.e. Linux, AIX,.. */
-static const char *system_dir   = "/usr/java";
 static const char *user_dir     = "/java";
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,6 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx), )`
`292`	`292`	`#`
`293`	`293`
`294`	`294`	`LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \`
`295`		`- -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \`
`296`	`295`	`$(FONTCONFIG_CFLAGS) \`
`297`	`296`	`$(CUPS_CFLAGS)`
`298`	`297`
`@@ -459,7 +458,7 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)`
`459`	`458`	`#`
`460`	`459`
`461`	`460`	`LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \`
`462`		`- -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"`
	`461`	`+ -DHEADLESS=true`
`463`	`462`
`464`	`463`	`$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \`
`465`	`464`	`NAME := awt_headless, \`