[Pkg-kde-commits] rev 254 - people/dato/packages/trunk/kdebindings/debian
Adeodato Sim??
dato-guest@haydn.debian.org
Sat, 13 Nov 2004 18:22:24 -0700
Author: dato-guest
Date: 2004-11-13 18:21:55 -0700 (Sat, 13 Nov 2004)
New Revision: 254
Added:
people/dato/packages/trunk/kdebindings/debian/mipsen.mk
Modified:
people/dato/packages/trunk/kdebindings/debian/changelog
people/dato/packages/trunk/kdebindings/debian/rules
Log:
More kdebindings 3.3.1-2 updates, refactoring. Changelog modified
entries:
- debian/rules:
+ include debian/mipsen.mk (see below).
+ define WITH_JAVA := --with-java=/usr and let CONFIGURE_FLAGS use that,
so that it can be overriden to --without-java inside mipsen.mk.
- debian/mipsen.mk:
+ new makefile snippet.
+ check if DEB_HOST_ARCH is in FUCKED_GCJ_ARCHS and, if so, define
WITHOUT_JAVA, redefine WITH_JAVA and override DH_OPTIONS adding -N
arguments for all six java packages.
Modified: people/dato/packages/trunk/kdebindings/debian/changelog
===================================================================
--- people/dato/packages/trunk/kdebindings/debian/changelog 2004-11-14 00:53:55 UTC (rev 253)
+++ people/dato/packages/trunk/kdebindings/debian/changelog 2004-11-14 01:21:55 UTC (rev 254)
@@ -6,21 +6,23 @@
- debian/control: add "[!mips !mipsel]" stanzas to Build-Depends entries
for gij, gcj, libgcj4-dev and fastjar.
- - debian/rules: exclude libdcop3-jni, libqt3-jni and libkde3-jni (via
- appropriate -N arguments in DH_OPTIONS) when $DEB_BUILD_GNU_TYPE is mips
- or mipsel. (Change done here and not in debian/control's Architecture:
- field for the benefit of unofficial architectures.)
+ - debian/rules:
+ + include debian/mipsen.mk (see below).
+ + define WITH_JAVA := --with-java=/usr and let CONFIGURE_FLAGS use that,
+ so that it can be overriden to --without-java inside mipsen.mk.
- - debian/rules: put WITH_JAVA := --with-java=/usr and let CONFIGURE_FLAGS
- use that, so that in can be overriden to --without-java in the mipsen
- check.
+ - debian/mipsen.mk:
+ + new makefile snippet.
+ + check if DEB_HOST_ARCH is in FUCKED_GCJ_ARCHS and, if so, define
+ WITHOUT_JAVA, redefine WITH_JAVA and override DH_OPTIONS adding -N
+ arguments for all six java packages.
* Fix build failure on machines with a lower limit on argument list length,
e.g. q650 on the m68k buildd network. Modify the already existing patch
030-koala-makefile-too-much-arguments.diff to apply the same changes to
qtjava/javalib/org/kde/qt/Makefile.in.
- -- Adeodato Simó <asp16@alu.ua.es> Sun, 14 Nov 2004 01:50:53 +0100
+ -- Adeodato Simó <asp16@alu.ua.es> Sun, 14 Nov 2004 02:19:09 +0100
kdebindings (4:3.3.1-1) unstable; urgency=low
Added: people/dato/packages/trunk/kdebindings/debian/mipsen.mk
===================================================================
--- people/dato/packages/trunk/kdebindings/debian/mipsen.mk 2004-11-14 00:53:55 UTC (rev 253)
+++ people/dato/packages/trunk/kdebindings/debian/mipsen.mk 2004-11-14 01:21:55 UTC (rev 254)
@@ -0,0 +1,17 @@
+# This file is to be included by debian/rules, and will prevent mipsen
+# buildds from trying to build any java packages. Commands in debian/rules
+# that are java-related should be safeguarded by a 'ifndef WITHOUT_JAVA'
+# check.
+
+FUCKED_GCJ_ARCHS = mips mipsel
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(FUCKED_GCJ_ARCHS)))
+ WITHOUT_JAVA := 1
+ WITH_JAVA := --without-java
+
+ # Don't let debhelper act on java packages (probably *-jni would be
+ # enough, but let's bet on the safe side).
+ override DH_OPTIONS += -Nlibdcop3-jni -Nlibqt3-jni -Nlibkde3-jni \
+ -Nlibdcop3-java -Nlibqt3-java -Nlibkde3-java
+endif
Modified: people/dato/packages/trunk/kdebindings/debian/rules
===================================================================
--- people/dato/packages/trunk/kdebindings/debian/rules 2004-11-14 00:53:55 UTC (rev 253)
+++ people/dato/packages/trunk/kdebindings/debian/rules 2004-11-14 01:21:55 UTC (rev 254)
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+WITH_JAVA := --with-java=/usr
CONFIGURE_FLAGS = $(WITH_JAVA) \
--with-pythondir=/usr/lib/python2.3/site-packages \
DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'
@@ -9,16 +10,16 @@
DH_MAKESHLIBS_ARGS = -V -Nlibkde3-jni -Nlibqt0-ruby1.8 -Nlibkorundum0-ruby1.8 ; \
dh_makeshlibs -n -V -plibkde3-jni -plibqt0-ruby1.8 -plibkorundum0-ruby1.8
-# See at end of file for changes on this variable
-WITH_JAVA := --with-java=/usr
-
+include debian/mipsen.mk
include debian/common/vars.mk
include debian/common/rules.mk
build::
# build dcopjava even though it's disabled upstream.
+ifndef WITHOUT_JAVA
cd $(objdir) && \
$(MAKE) -C dcopjava
+endif
clean::
# if Makefile exists run distclean
@@ -30,6 +31,7 @@
upstream_version=$(shell head -1 $(CURDIR)/debian/changelog | sed -e "s,.*:\([^-]*\).*,\1,")
make-install::
+ifndef WITHOUT_JAVA
cd $(objdir) && \
$(MAKE) -C dcopjava install DESTDIR=$(CURDIR)/debian/tmp
# DCOPPerl is disabled.
@@ -46,6 +48,7 @@
mv debian/tmp/usr/lib/java/koala.jar debian/tmp/usr/share/java/koala-$(upstream_version).jar
ln -s koala-$(upstream_version).jar debian/tmp/usr/share/java/koala.jar
+endif
# Provide a Makefile for the example
cp $(objdir)/kjsembed/docs/embedding/simple-embed/Makefile kjsembed/docs/embedding/simple-embed
@@ -59,12 +62,3 @@
libdcop3-java-dev libdcop3-java \
libsmokekde-dev libsmokeqt-dev \
kjscmd libkjsembed-dev
-
-# Override DH_OPTIONS to exclude jni packages in mipsen.
-FUCKED_GCJ_ARCHS = mips mipsel
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(FUCKED_GCJ_ARCHS)))
- override DH_OPTIONS += -Nlibdcop3-jni -Nlibqt3-jni -Nlibkde3-jni
- WITH_JAVA := --without-java
-endif