------------------------------------------------------------ revno: 651 committer: Matthias Klose <d...@ubuntu.com> branch nick: openjdk8 timestamp: Fri 2015-09-04 16:47:35 +0200 message: * Make derivatives builds the same as the parent distro. Closes: #797665. modified: debian/changelog debian/rules
-- lp:~openjdk/openjdk/openjdk8 https://code.launchpad.net/~openjdk/openjdk/openjdk8 Your team Debian Java Maintainers is subscribed to branch lp:~openjdk/openjdk/openjdk8. To unsubscribe from this branch go to https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog' --- debian/changelog 2015-09-04 14:45:46 +0000 +++ debian/changelog 2015-09-04 14:47:35 +0000 @@ -6,6 +6,7 @@ * Fix jdk gensrc build on x32. * Re-enable the atk bridge for releases with a fixed atk bridge. * Really apply the 32bit detection patch. Closes: #787072. + * Make derivatives builds the same as the parent distro. Closes: #797665. -- Matthias Klose <d...@ubuntu.com> Thu, 13 Aug 2015 14:21:26 +0200 === modified file 'debian/rules' --- debian/rules 2015-09-04 14:45:46 +0000 +++ debian/rules 2015-09-04 14:47:35 +0000 @@ -28,6 +28,9 @@ distribution := $(shell lsb_release --id --short) distrel := $(shell lsb_release --codename --short) +derivative := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \ + elif dpkg-vendor --derives-from Debian; then echo Debian; \ + else echo Unknown; fi) ifeq ($(distrel),n/a) distrel := sid endif @@ -300,7 +303,7 @@ endif ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf)) -ifeq ($(distribution),Ubuntu) +ifeq ($(derivative),Ubuntu) OPT_CFLAGS/cppInterpreter_arm.o = -march=armv6 -mtune=cortex-a8 -O2 -falign-functions=64 -falign-loops=8 -g0 else OPT_CFLAGS/cppInterpreter_arm.o = -O2 -falign-functions=32 -falign-loops=8 -g0 @@ -330,7 +333,7 @@ on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd ] && echo yes) -ifeq ($(distribution),Debian) +ifeq ($(derivative),Debian) with_wm = $(notdir $(firstword $(wildcard /usr/bin/metacity /usr/bin/twm))) ifneq (,$(findstring twm, $(with_wm))) with_wm_args = -f $(CURDIR)/bin/jtreg.tmwrc @@ -801,7 +804,7 @@ # .desktop files need to be multiarch installable java_launcher = /$(basedir)/bin/java java_launcher = /usr/bin/java -ifeq ($(distribution),Ubuntu) +ifeq ($(derivative),Ubuntu) java_launcher = cautious-launcher %f /$(basedir)/bin/java java_launcher = cautious-launcher %f /usr/bin/java endif @@ -1619,7 +1622,7 @@ rm -f debian/*.install debian/*.links debian/*.debhelper.log lib_ext_dirs = common $(sort $(foreach arch,$(arch_map),$(firstword $(subst =,$(SPACE),$(arch))))) -ifeq ($(distribution),Ubuntu) +ifeq ($(derivative),Ubuntu) lib_ext_dirs := $(filter-out arm hppa m68k mips% powerpcspe s390% sh%, $(lib_ext_dirs)) else lib_ext_dirs := $(filter-out arm hppa, $(lib_ext_dirs))
__ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use debian-j...@lists.debian.org for discussions and questions.