openjdk team mailing list archive

[Hector Oron <zumbi@xxxxxxxxxx>]

Source: openjdk-6
Version: 6-6b36-1.13.8
Severity: wishlist

Hello,

  Please consider patching your package so derivative distributions are able
  to use same build runes as parent distribution.

Regards

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (900, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 4.1.0-1-686-pae (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff -u openjdk-6-6b36-1.13.8/debian/rules openjdk-6-6b36-1.13.8/debian/rules
--- openjdk-6-6b36-1.13.8/debian/rules
+++ openjdk-6-6b36-1.13.8/debian/rules
@@ -25,6 +25,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
@@ -249,7 +252,7 @@
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
-ifeq ($(distribution),Ubuntu)
+ifeq ($(derivative),Ubuntu)
   ifneq (,$(filter $(distrel),jaunty))
     OPT_CFLAGS/cppInterpreter_arm.o = -O2 -falign-functions=32 -falign-loops=8 -g0
   else
@@ -292,7 +295,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
@@ -381,7 +384,7 @@
 ifeq ($(DEB_HOST_ARCH),armel)
   ifeq ($(distrel),quantal)
     DISTRIBUTION_PATCHES += debian/patches/cacao-armv4.diff
-  else ifeq ($(distribution),Debian)
+  else ifeq ($(derivative),Debian)
     DISTRIBUTION_PATCHES += debian/patches/cacao-armv4.diff
   endif
 endif
@@ -690,7 +693,7 @@
   rhino_source := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W rhino)
 endif
 
-pkg_ffidev = $(if $(filter $(distribution),Ubuntu),$(if $(filter $(distrel),dapper hardy),libffi4-dev,libffi-dev),libffi-dev)
+pkg_ffidev = $(if $(filter $(derivative),Ubuntu),$(if $(filter $(distrel),dapper hardy),libffi4-dev,libffi-dev),libffi-dev)
 
 bd_zero = \
 	$(pkg_ffidev) [$(foreach a,$(hotspot_archs),!$(a))],
@@ -796,7 +799,7 @@
 # .desktop files need to be multiarch installable
 java_launcher = /$(basedir)/bin/java
 java_launcher = /usr/bin/java
-ifeq ($(distribution),Ubuntu)
+ifeq ($(derivative),Ubuntu)
   ifeq (,$(filter $(distrel),karmic jaunty intrepid hardy gutsy feisty edgy dapper))
     java_launcher = cautious-launcher %f /$(basedir)/bin/java
     java_launcher = cautious-launcher %f /usr/bin/java
@@ -1429,7 +1432,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 lpia, $(lib_ext_dirs))