Allow using a system-installed giflib
Omair Majid
omajid at redhat.com
Tue Apr 9 22:11:08 UTC 2013
On 04/09/2013 06:01 PM, Brad Wetmore wrote:
> Mike/Omair/Eric,
>
> This putback has likely broken the old JDK build (i.e. in jdk/make)
>
> JDK-8011812: JDK-8011278 breaks the old build
Sorry for this.
> At least deploy and JCE are still stuck on the old build.
I would like to avoid this in the future; any tips on how to run the old
build? I couldn't get it to work last I tried (the error messages were
redirecting me to the new build).
> One workaround that is said to work:
>
> diff --git a/make/sun/splashscreen/Makefile
> b/make/sun/splashscreen/Makefile
> --- a/make/sun/splashscreen/Makefile
> +++ b/make/sun/splashscreen/Makefile
> @@ -89,7 +89,7 @@
> -I$(OPENWIN_HOME)/include/X11/extensions
> OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread
> else
> - CPPFLAGS += -I$(OPENWIN_HOME)/include
> -I$(OPENWIN_HOME)/include/X11/extensions
> + CPPFLAGS += -I$(OPENWIN_HOME)/include
> -I$(OPENWIN_HOME)/include/X11/extensions
> -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
> OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
> endif
> else # PLATFORM
The change looks sensible to me since it adds the same path to
C(PP)FLAGS that's added in the new build:
http://cr.openjdk.java.net/~omajid/webrevs/system-giflib/02/jdk/makefiles/CompileNativeLibraries.gmk.udiff.html
> Since Eric is the RE for 8011278, I'm going to assign him this one.
I will be happy to test this change too.
Omair
--
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681
More information about the build-dev
mailing list