aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new')
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new62
1 files changed, 0 insertions, 62 deletions
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new b/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new
deleted file mode 100644
index c14d378..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/jdk/make/sun/awt/mawt.gmk b/jdk/make/sun/awt/mawt.gmk
-index 45e8349..ed452ba 100644
---- a/jdk/make/sun/awt/mawt.gmk
-+++ b/jdk/make/sun/awt/mawt.gmk
-@@ -151,22 +151,6 @@ else
- #endif
-
- LIBXTST = -lXtst
--ifeq ($(PLATFORM), linux)
-- ifeq ($(ARCH_DATA_MODEL), 64)
-- # XXX what about the rest of them?
-- LIBXT = -lXt
-- else
-- # Allows for builds on Debian GNU Linux, X11 is in a different place
-- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
-- $(wildcard /usr/lib/libXt.a))
-- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
-- $(wildcard /usr/lib/libSM.a))
-- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
-- $(wildcard /usr/lib/libICE.a))
-- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
-- $(wildcard /usr/lib/libXtst.a))
-- endif
--endif
-
- # Use -lXmu for EditRes support
- LIBXMU_DBG = -lXmu
-@@ -181,7 +165,7 @@ ifeq ($(PLATFORM), linux)
- OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
- # XXX what is this define below? Isn't it motif-related?
- OTHER_CFLAGS += -DXMSTRINGDEFINES=1
--OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
-+OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lXi -lX11
- endif
-
- endif
-@@ -230,12 +214,6 @@ else
- CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
- endif
-
--ifndef HEADLESS
--CPPFLAGS += -I$(OPENWIN_HOME)/include
--LDFLAGS += -L$(OPENWIN_LIB)
--
--endif # !HEADLESS
--
- CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-@@ -258,12 +236,6 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- $(EVENT_MODEL)
-
--ifeq ($(PLATFORM), linux)
-- # Checking for the X11/extensions headers at the additional location
-- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
-- $(wildcard /usr/include/X11/extensions))
--endif
--
- ifeq ($(PLATFORM), solaris)
- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
- endif