RFR: JDK-8011812: JDK-8011278 breaks the old build

[Brad Wetmore]

Erik,

Wait, this doesn't work on Windows.  I think you need to add this to the 
Windows case also.  See my patch below.

[brwetmor at glisten] 208 >hg diff Makefile
diff --git a/make/sun/splashscreen/Makefile b/make/sun/splashscreen/Makefile
--- a/make/sun/splashscreen/Makefile
+++ b/make/sun/splashscreen/Makefile
@@ -86,14 +86,17 @@
    ifeq ($(PLATFORM), macosx))
      OTHER_LDLIBS += -liconv
      CPPFLAGS += -I$(OPENWIN_HOME)/include \
-                -I$(OPENWIN_HOME)/include/X11/extensions
+                -I$(OPENWIN_HOME)/include/X11/extensions \
+                -I$(SHARE_SRC)/native/sun/awt/giflib
      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$(SHARE_SRC)/native/sun/awt/giflib
      OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
    endif
  else # PLATFORM
    CFLAGS += -DWITH_WIN32
+  CPPFLAGS += -I$(SHARE_SRC)/native/sun/awt/giflib
    OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib 
/DELAYLOAD:user32.dll
  #$(JVMLIB) $(OBJDIR)/../../jpeg/$(OBJDIRNAME)/jpeg$(SUFFIX).lib
  endif # PLATFORM




On 4/10/2013 11:37 AM, Brad Wetmore wrote:
> Looks good to me.
>
> Can you, or I, push this to TL?
>
> We need this for a putback I'm planning in the next day or two.
>
> Brad
>
>
>
> On 4/10/2013 3:07 AM, Erik Joelsson wrote:
>> http://cr.openjdk.java.net/~erikj/8011812/webrev.jdk.01/
>>
>> I modified the patch a bit, also adding the include for macosx and
>> changed to the SHARED_SRC variable used in the old build.
>>
>> /Erik
>>
>> On 2013-04-10 00:01, 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
>>>
>>> At least deploy and JCE are still stuck on the old 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
>>>
>>> Since Eric is the RE for 8011278, I'm going to assign him this one.
>>>
>>> Thanks,
>>>
>>> Brad
>>>
>>>
>>>
>>>
>>> On 4/2/2013 10:45 AM, Mike Duigou wrote:
>>>> Done!
>>>>
>>>> JDK-8011278 : Allow using a system-installed giflib
>>>>
>>>> On Apr 2 2013, at 10:21 , Omair Majid wrote:
>>>>
>>>>> On 03/20/2013 03:49 AM, Erik Joelsson wrote:
>>>>>> This looks good to me. Thanks!
>>>>>
>>>>> I would like to push this. Could I get a bug ID, please?
>>>>>
>>>>> Thanks,
>>>>> Omair
>>>>> --
>>>>> PGP Key: 66484681 (http://pgp.mit.edu/)
>>>>> Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
>>>>