Ubuntu
db4.8 package

Merge lp:~peter-pearse/ubuntu/natty/db4.8/prop001 into lp:ubuntu/natty/db4.8

  1. Natty (11.04)
  2. prop001
  3. Merge into natty
Proposed by Peter Pearse
Status: Needs review
Proposed branch: lp:~peter-pearse/ubuntu/natty/db4.8/prop001
Merge into: lp:ubuntu/natty/db4.8
Diff against target: 65 lines (+17/-3)
2 files modified
debian/changelog (+6/-0)
debian/rules (+11/-3)
To merge this branch: bzr merge lp:~peter-pearse/ubuntu/natty/db4.8/prop001
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+56390@code.launchpad.net

Description of the change

Dropped java for cross builds.
Needed to awk debian/files otherwise dpkg-genchanges barfs.

To post a comment you must log in.

Unmerged revisions

18. By Peter Pearse

No java for cross builds.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-17 01:10:56 +0000
3+++ debian/changelog 2011-04-05 15:24:42 +0000
4@@ -1,3 +1,9 @@
5+db4.8 (4.8.30-5ubuntu3) natty; urgency=low
6+
7+ * No java for cross builds
8+
9+ -- Peter Pearse <peter.pearse@linaro.org> Tue, 05 Apr 2011 15:16:28 +0000
10+
11 db4.8 (4.8.30-5ubuntu2) natty; urgency=low
12
13 * Build for multiarch, adding Pre-Depends: multiarch-support to the shared
14
15=== modified file 'debian/rules'
16--- debian/rules 2011-03-05 08:06:57 +0000
17+++ debian/rules 2011-04-05 15:24:42 +0000
18@@ -30,7 +30,7 @@
19 CFLAGS += -mno-vsx
20 endif
21
22-JAVA_UNSUPPORTED_CPUS = zm32rz zhppaz zavr32z
23+JAVA_UNSUPPORTED_CPUS = zm32rz zhppaz zavr32z zarmz
24 JAVA_UNSUPPORTED_SYSTEMS = zgnuz zknetbsd-gnuz
25 -include /usr/share/gcj/debian_defaults
26
27@@ -39,7 +39,7 @@
28 TCLDIR=/usr/lib/tcl8.5
29 else
30 CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.5"
31- TCLDIR=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl8.5
32+ TCLDIR=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl8.5 --disable-java
33 endif
34
35 CONFIGURE_SWITCHES = --prefix=/usr \
36@@ -139,6 +139,7 @@
37 -rm -rf debian/tmp debian/$(package)* debian/lib$(package)* core
38 -rm -f debian/substvars.*
39 rm -rf debian/libdb*
40+ -rm debian/files.org debian/files
41
42 install-stamp: build
43 $(checkdir)
44@@ -152,7 +153,6 @@
45
46 binary-indep: checkroot build install-stamp
47 $(checkdir)
48-
49 rm -rf debian/$(package)-doc
50 $(INSTALL_DIR) debian/$(package)-doc/usr/share/doc debian/$(package)-doc/DEBIAN
51
52@@ -169,6 +169,14 @@
53 chmod -R ugo=rX,u+w debian/$(package)-doc
54 dpkg --build debian/$(package)-doc ..
55
56+ifeq (,$(JAVA_BIiN))
57+ if [ -f debian/files ]; then \
58+ echo "No java support on this platform" ;\
59+ mv debian/files debian/files.org ;\
60+ awk '/java/{next;};{print;}' debian/files.org > debian/files ;\
61+ fi
62+endif
63+
64 binary-arch: checkroot build install-stamp
65 $(checkdir)
66

Subscribers

People subscribed via source and target branches

to all changes: