tags 382260 pending thanks I submitted this bug 10 days ago, and sablevm has been failing in hppa for 193 days now. Therefore, I'm going to upload an NMU that includes the ffitarget.h as suggested.
While preparing the NMU, I found out that many files were not being cleaned
up and therefore ended up in the .diff.gz, so I took the opportunity to fix
this.
Therefore, the .diff.gz is much smaller now. I'm attaching the full
diff.gz file, and the diff with the changes that I made to the source
package.
I also modified debian/rules a little bit, so that the LGPL-2.1 is not
installed unnecesarilly, and a symlink is placed there instead, closing an
old bug.
--
Love,
Marga.
diff -u sablevm-1.13/debian/rules sablevm-1.13/debian/rules
--- sablevm-1.13/debian/rules
+++ sablevm-1.13/debian/rules
@@ -49,8 +49,10 @@
clean:
dh_testdir
dh_testroot
- -$(MAKE) clean
- rm -f config.log
+ -$(MAKE) -C src/libffi/ distclean
+ -$(MAKE) -C src/libpopt/ distclean
+ -$(MAKE) distclean
+ -rm -f config.log src/libffi/config.log src/libpopt/config.log
find $(CURDIR) -name Makefile |xargs rm -f
find $(CURDIR) -type d -name .deps |xargs rm -rf
rm -f config.status libtool src/include/config.h src/include/stamp-h1
@@ -68,6 +70,9 @@
-mkdir -p $(CURDIR)/debian/tmp/usr/lib/sablevm/bin
ln -sf ../common-licenses/LGPL-2.1 \
$(CURDIR)/debian/tmp/usr/share/sablevm/COPYING.LIB
+ -rm $(CURDIR)/debian/tmp/usr/share/sablevm/LGPL-2.1
+ ln -sf ../common-licenses/LGPL-2.1 \
+ $(CURDIR)/debian/tmp/usr/share/sablevm/LGPL-2.1
install -p -m 0644 debian/sablevm.lintian \
$(CURDIR)/debian/sablevm/usr/share/lintian/overrides/sablevm
# install jikes-sablevm wrapper
diff -u sablevm-1.13/debian/changelog sablevm-1.13/debian/changelog
--- sablevm-1.13/debian/changelog
+++ sablevm-1.13/debian/changelog
@@ -1,3 +1,16 @@
+sablevm (1.13-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload to fix Failure To Build From Source in hppa, due to
+ missing ffitarget.h
+ * Added src/libffi/src/pa/ffitarget.h, from the gcc package.
+ (Closes: #382260)
+ * debian/rules: changed "clean" for "distclean", and added to extra
+ distclean calls, so that no unnecesary files are shipped in the .diff.gz
+ * debian/rules: fixed the install rule so that the LGPL-2.1 file is a
+ symlink to the common-licenses one. (Closes: #254576)
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Sat, 19 Aug 2006 23:44:37 -0300
+
sablevm (1.13-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- sablevm-1.13.orig/src/libffi/src/pa/ffitarget.h
+++ sablevm-1.13/src/libffi/src/pa/ffitarget.h
@@ -0,0 +1,59 @@
+/* -----------------------------------------------------------------*-C-*-
+ ffitarget.h - Copyright (c) 1996-2003 Red Hat, Inc.
+ Target configuration macros for hppa.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ ``Software''), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ ----------------------------------------------------------------------- */
+
+#ifndef LIBFFI_TARGET_H
+#define LIBFFI_TARGET_H
+
+/* ---- System specific configurations ----------------------------------- */
+
+#ifndef LIBFFI_ASM
+typedef unsigned long ffi_arg;
+typedef signed long ffi_sarg;
+
+typedef enum ffi_abi {
+ FFI_FIRST_ABI = 0,
+
+#ifdef PA
+ FFI_LINUX,
+ FFI_DEFAULT_ABI = FFI_LINUX,
+#endif
+
+ FFI_LAST_ABI = FFI_DEFAULT_ABI + 1
+} ffi_abi;
+#endif
+
+/* ---- Definitions for closures ----------------------------------------- */
+
+#define FFI_CLOSURES 1
+#define FFI_NATIVE_RAW_API 0
+
+#define FFI_TRAMPOLINE_SIZE 32
+
+#define FFI_TYPE_SMALL_STRUCT3 -1
+#define FFI_TYPE_SMALL_STRUCT5 -2
+#define FFI_TYPE_SMALL_STRUCT6 -3
+#define FFI_TYPE_SMALL_STRUCT7 -4
+#endif
+
sablevm_1.13-1.1.diff.gz
Description: Binary data
