On 2004-06-14 Arnaud Vandyck <[EMAIL PROTECTED]> wrote:
> Andreas Metzler <[EMAIL PROTECTED]> writes:
[...]
> > s390 and i386 continue to build, sparc and mipsel failed again, the
> > other archs have not been tried yet.
[...]
> mipsel: don't have libffi2-dev, so I have to find a way to change the
> CONFIGFLAG only for mipsel... any idea?.. I'm not a make guru,
> I'll read the documentation carefully ;-)
-Build-Depends: ... libffi2-dev ...
+Build-Depends: ... libffi2-dev[!mipsel] ...
replace all occurences of "--with-libffi" in debian/rules with
"$(LIBFFIAVAILABLE)" and add this near the top of debian/rules:
ifneq ($(shell dpkg --print-architecture),mipsel)
LIBFFIAVAILABLE := --with-libffi
endif
See attachment for an untested patch.
cu andreas
--
"See, I told you they'd listen to Reason," [SPOILER] Svfurlr fnlf,
fuhggvat qbja gur juveyvat tha.
Neal Stephenson in "Snow Crash"
--- debian/rules 2004-06-14 13:08:55.000000000 +0200
+++ ../rules 2004-06-14 13:08:48.000000000 +0200
@@ -16,6 +16,10 @@
KAFFE_JIKES := 1
KAFFE_GCJ :=
+ifneq ($(shell dpkg --print-architecture),mipsel)
+ LIBFFIAVAILABLE := --with-libffi
+endif
+
CONFFLAGS := \
--with-pic \
--infodir='/usr/share/info' \
@@ -25,7 +29,7 @@
--disable-debug \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
- --with-libffi \
+ $(LIBFFIAVAILABLE) \
--with-jikes \
# --disable-sound \
@@ -90,10 +94,10 @@
$(STAMP_DIR)/build-pthreads-profile $(STAMP_DIR)/build-pthreads:
$(STAMP_DIR)/build-jthreads
-$(STAMP_DIR)/configure-pthreads-profile: CONFFLAGS += --with-staticvm
--with-staticlib --disable-debug
--with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar --with-libffi
--with-jikes
+$(STAMP_DIR)/configure-pthreads-profile: CONFFLAGS += --with-staticvm
--with-staticlib --disable-debug
--with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar $(LIBFFIAVAILABLE)
--with-jikes
# --with-profiling --enable-xprofiling
# --disable-sound
-$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --disable-debug
--with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar --with-libffi
--with-jikes
+$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --disable-debug
--with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar $(LIBFFIAVAILABLE)
--with-jikes
configure: $(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS))
$(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS)): $(STAMP_DIR)/configure-%:
$(patched)
