[openjdk-8] 07/10: Drop support for lucid
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Mar 30 23:33:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjdk-8.
commit 7580b1b8a39a0f96aed865614abd60b2bf40533a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Mar 30 23:21:02 2014 +0200
Drop support for lucid
---
debian/rules | 91 +++++++++++++++---------------------------------------------
1 file changed, 23 insertions(+), 68 deletions(-)
diff --git a/debian/rules b/debian/rules
index 1718855..4bf7cd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ shark_archs = amd64 i386 lpia kfreebsd-amd64 kfreebsd-i386
# Shark build but just crash
shark_archs =
-ifneq (,$(filter $(distrel),lucid precise wheezy))
+ifneq (,$(filter $(distrel),precise wheezy))
is_default = no
else
is_default = yes
@@ -138,10 +138,8 @@ ifneq (,$(filter $(distrel),wheezy precise quantal))
transitional_cacao_pkg = yes
endif
-ifeq (,$(filter $(distrel),lucid))
- jamvm_archs = amd64 armel armhf i386 lpia mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64
-endif
-ifeq (,$(filter $(distrel),wheezy lucid))
+jamvm_archs = amd64 armel armhf i386 lpia mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64
+ifeq (,$(filter $(distrel),wheezy))
jamvm_defaults =
endif
@@ -251,11 +249,7 @@ export EXTRA_CXXFLAGS_CACAO := $(shell $(dpkg_buildflags_cacao) --get CXXFLAGS)
export EXTRA_LDFLAGS_CACAO := $(shell $(dpkg_buildflags_cacao) --get LDFLAGS)
# This section should be in sync with "bd_gcc" definition
-ifneq (,$(filter $(distrel),lucid))
- export CC = gcc-4.4
- export CXX = g++-4.4
- GCJ_SUFFIX = -4.4
-else ifneq (,$(filter $(distrel),wheezy quantal raring))
+ifneq (,$(filter $(distrel),wheezy quantal raring))
export CC = gcc-4.7
export CXX = g++-4.7
GCJ_SUFFIX = -4.7
@@ -286,14 +280,7 @@ export OPT_CFLAGS/cppInterpreter_arm.o
endif
with_pulse = yes
-
-ifneq (,$(filter $(distrel),lucid))
- with_bridge = bridge
- with_jni_bridge = yes
-else
- with_bridge = atk
-endif
-
+with_bridge = atk
with_nss = yes
with_tzdata = yes
@@ -312,7 +299,7 @@ else
ifneq (,$(findstring twm, $(with_wm)))
with_wm_args = -f $(CURDIR)/bin/jtreg.tmwrc
endif
- ifneq (,$(filter $(distrel),saucy raring quantal precise lucid))
+ ifneq (,$(filter $(distrel),saucy raring quantal precise))
bd_wm = metacity | twm, dbus-x11,
else
bd_wm = twm,
@@ -391,11 +378,9 @@ endif
# FIXME needs an update:
# $(if $(with_wgy_zenhai),,debian/patches/fontconfig-arphic-uming.diff) \
-ifeq (,$(filter $(distrel),lucid))
DISTRIBUTION_PATCHES += \
debian/patches/fontconfig-korean-nanum.diff \
debian/patches/fontconfig-japanese.diff
-endif
DISTRIBUTION_PATCHES += \
debian/patches/hotspot-libpath-$(hotspot_version).diff
@@ -532,7 +517,7 @@ ifneq (,$(bootjdk_gcj_archs))
ecj-gcj [$(strip $(foreach a,$(bootjdk_gcj_archs), $(a)))],
bootjdk_gcj46_archs = m68k s390
bootjdk_gcj_default_archs = $(filter-out $(bootjdk_gcj46_archs), $(bootjdk_gcj_archs))
- ifneq (,$(filter $(distrel),wheezy lucid precise))
+ ifneq (,$(filter $(distrel),wheezy precise))
bd_bootstrap += \
gcj-jdk [$(strip $(foreach a,$(bootjdk_gcj_default_archs), $(a)))], \
gcj-4.6-jdk [$(strip $(foreach a,$(bootjdk_gcj46_archs), $(a)))], \
@@ -554,9 +539,7 @@ ifneq (,$(bootjdk_cacao_archs))
endif
# This section should be in sync with "CC/CXX" definition
-ifneq (,$(filter $(distrel),lucid))
- bd_gcc = g++-4.4 (>= 4.4.1),
-else ifneq (,$(filter $(distrel), precise))
+ifneq (,$(filter $(distrel), precise))
bd_gcc = g++-4.6,
else ifneq (,$(filter $(distrel), wheezy))
bd_gcc = g++-4.7, g++-4.4 [mips mipsel],
@@ -565,14 +548,7 @@ else ifneq (,$(filter $(distrel), quantal raring))
else
bd_gcc = g++-4.8,
endif
-bd_syslibs = zlib1g-dev, libattr1-dev,
-ifneq (,$(filter $(distrel),lucid))
- bd_syslibs += libpng12-dev, libjpeg62-dev,
-else
- bd_syslibs += libpng-dev, libjpeg8-dev,
-endif
-bd_syslibs += \
- libgif-dev,
+bd_syslibs = zlib1g-dev, libattr1-dev, libpng-dev, libjpeg8-dev, libgif-dev,
bd_openjdk = \
libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, \
libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, \
@@ -587,19 +563,14 @@ bd_zero = \
ifneq (,$(shark_archs))
bd_zero = $(pkg_ffidev),
- ifneq (,$(filter $(distrel),lucid))
- bd_shark = llvm-dev (>= 2.7) [$(foreach a,$(shark_archs) $(altshark_archs),$(a))],
- bd_shark += oprofile [$(foreach a,$(shark_archs) $(altshark_archs),$(a))],
+ ifneq (,$(filter $(distrel),precise))
+ llvm_suffix = -2.9
else
- ifneq (,$(filter $(distrel),precise))
- llvm_suffix = -2.9
- else
- llvm_suffix = -3.0
- endif
- bd_shark = llvm$(llvm_suffix)-dev [$(foreach a,$(shark_archs) $(altshark_archs),$(a))],
- ifneq (,$(filter $(DEB_HOST_ARCH),$(shark_archs) $(altshark_archs)))
- CONFIGURE_ARGS += --with-llvm-config=llvm-config$(llvm_suffix)
- endif
+ llvm_suffix = -3.0
+ endif
+ bd_shark = llvm$(llvm_suffix)-dev [$(foreach a,$(shark_archs) $(altshark_archs),$(a))],
+ ifneq (,$(filter $(DEB_HOST_ARCH),$(shark_archs) $(altshark_archs)))
+ CONFIGURE_ARGS += --with-llvm-config=llvm-config$(llvm_suffix)
endif
endif
@@ -616,9 +587,7 @@ ifeq ($(with_pulse),yes)
bd_pulsejava = libpulse-dev (>= 0.9.12),
endif
ifeq ($(with_nss),yes)
- ifneq (,$(filter $(distrel),lucid))
- bd_nss = libnss3-dev (>= 3.12.3),
- else ifneq (,$(filter $(distrel),wheezy sid))
+ ifneq (,$(filter $(distrel),wheezy sid))
bd_nss = libnss3-dev (>= 2:3.13.4),
else
bd_nss = libnss3-dev (>= 3.12.9+ckbi-1.82-0ubuntu4),
@@ -636,9 +605,7 @@ dlopen_hl_depends = \
libcups2, liblcms2-2, \
$(if $(findstring jpeg8, $(bd_syslibs)),libjpeg8,libjpeg62)
ifneq ($(with_nss),no)
- ifneq (,$(filter $(distrel),lucid))
- dlopen_hl_depends += , libnss3-1d (>= 3.12.3)
- else ifneq (,$(filter $(distrel), wheezy sid))
+ ifneq (,$(filter $(distrel), wheezy sid))
dlopen_hl_depends += , libnss3 (>= 2:3.13.4)
else
dlopen_hl_depends += , libnss3-1d (>= 3.12.9+ckbi-1.82-0ubuntu4)
@@ -667,21 +634,15 @@ ifeq ($(distribution),Ubuntu)
java_launcher = cautious-launcher %f /usr/bin/java
endif
-ifneq (,$(filter $(distrel),wheezy lucid precise quantal raring))
+ifneq (,$(filter $(distrel),wheezy precise quantal raring))
core_fonts = ttf-dejavu-extra
else
core_fonts = fonts-dejavu-extra
endif
-ifneq (,$(filter $(distrel),lucid))
- cjk_fonts = ttf-baekmuk | ttf-unfonts | ttf-unfonts-core,
- cjk_fonts += ttf-sazanami-gothic | ttf-kochi-gothic,
- cjk_fonts += ttf-sazanami-mincho | ttf-kochi-mincho,
-else
- cfk_fonts = fonts-nanum,
- cjk_fonts += fonts-ipafont-gothic, fonts-ipafont-mincho,
- # FIXME: find out why this b-d is needed, the fontconfig compiler fails without it
- bd_openjdk += fonts-ipafont-mincho,
-endif
+cfk_fonts = fonts-nanum,
+cjk_fonts += fonts-ipafont-gothic, fonts-ipafont-mincho,
+# FIXME: find out why this b-d is needed, the fontconfig compiler fails without it
+bd_openjdk += fonts-ipafont-mincho,
cjk_fonts += $(if $(with_wgy_zenhai),ttf-wqy-microhei | ttf-wqy-zenhei,ttf-arphic-uming),
ifneq (,$(filter $(distrel),wheezy sid experimental))
cjk_fonts += ttf-indic-fonts,
@@ -755,8 +716,6 @@ ifeq ($(with_bridge),atk)
else ifeq ($(with_bridge),yes)
ifneq (,$(DEB_HOST_MULTIARCH))
control_vars += '-Vdep:bridge=libaccess-bridge-java-jni (>= 1.26.2-6)'
- else ifeq ($(with_jni_bridge),yes)
- control_vars += '-Vdep:bridge=libaccess-bridge-java-jni'
else
control_vars += '-Vdep:bridge=libaccess-bridge-java'
endif
@@ -1654,10 +1613,6 @@ else ifeq ($(with_bridge),yes)
: # create links for the gnome accessibility bridge
echo "usr/share/java/gnome-java-bridge.jar $(basedir)/jre/lib/ext/gnome-java-bridge.jar" \
>> $(d_jre).links
- ifeq ($(with_jni_bridge),yes)
- echo "usr/lib$(multiarch_dir)/jni/libjava-access-bridge-jni.so $(basedir)/jre/lib/ext/libjava-access-bridge-jni.so" \
- >> $(d_jre).links
- endif
endif
ifeq ($(with_tzdata),yes)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git
More information about the pkg-java-commits
mailing list