1
Description: Handle EXTRA_* flags into openjdk
2
- jsig: Add $EXTRA_CFLAGS to CC
3
- launcher: Add $EXTRA_CFLAGS/$EXTRA_LDFLAGS to CC/LD
4
- hotspot: Fix typo on EXTRA_LDFLAGS
5
- jdk: Append EXTRA_* to exisint flags
6
Author: Damien Raude-Morvan <drazzib@debian.org>
8
--- openjdk/hotspot/make/linux/makefiles/jsig.make.orig
9
+++ openjdk/hotspot/make/linux/makefiles/jsig.make
11
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
12
@echo Making signal interposition lib...
13
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
14
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
15
+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS_HS) -o $@ $< -ldl
16
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
17
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
18
ifneq ($(STRIP_POLICY),no_strip)
19
--- openjdk/hotspot/make/linux/makefiles/launcher.make.orig
20
+++ openjdk/hotspot/make/linux/makefiles/launcher.make
23
$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
24
$(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
25
- $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
26
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(EXTRA_CFLAGS_HS) $(CXXFLAGS)
28
$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
29
$(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
30
- $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
31
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(EXTRA_CFLAGS_HS) $(CXXFLAGS)
33
$(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
34
$(QUIETLY) echo Linking launcher...
35
$(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
36
- $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER)
37
+ $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) $(EXTRA_LDFLAGS_HS) -o $@ $(OBJS) $(LIBS_LAUNCHER)
38
$(QUIETLY) $(LINK_LAUNCHER/POST_HOOK)
40
$(LAUNCHER): $(LAUNCHER_SCRIPT)
41
--- openjdk/hotspot/make/linux/makefiles/vm.make.orig
42
+++ openjdk/hotspot/make/linux/makefiles/vm.make
44
CFLAGS += $(CFLAGS/NOEX)
46
# Extra flags from gnumake's invocation or environment
47
-CFLAGS += $(EXTRA_CFLAGS)
48
-LFLAGS += $(EXTRA_CFLAGS)
49
+CFLAGS += $(EXTRA_CFLAGS_HS)
50
+LFLAGS += $(EXTRA_LDFLAGS_HS)
52
# Don't set excutable bit on stack segment
53
# the same could be done by separate execstack command
54
--- openjdk/jdk/make/common/Defs.gmk.orig
55
+++ openjdk/jdk/make/common/Defs.gmk
57
# EXTRA_CFLAGS are used to define cross-compilation options
59
ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
60
-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(EXTRA_CFLAGS)
61
-CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(EXTRA_CFLAGS)
62
+CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(EXTRA_CFLAGS_JDK)
63
+CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(EXTRA_CXXFLAGS_JDK)
64
CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
65
- $(DEFINES) $(OPTIONS:%=-D%)
66
-LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS)
67
+ $(DEFINES) $(OPTIONS:%=-D%) $(EXTRA_CPPFLAGS_JDK)
68
+LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(EXTRA_LDFLAGS_JDK)
69
LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON)
70
LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \