retitle 381341 wine: FTBFS (amd64): Please add support to build wine on amd64
thanks
Hello,
the attached patch will make 'wine' build on amd64 provided that some
extra lib*.so symlinks are being added to the ia32-libs package (a
separate report with a patch has been filed to the BTS for ia32-libs).
The attached patch does the following:
- change the architecture lines in debian/control to include amd64
- change debian/rules to add ia32-libs to the Depends of libwine on amd64
- change debian/rules so that it does not try to move glut32* files on amd64
- add '-fatal-warnings' to the ICU library check in configure{,.ac}
to make that test fail on amd64 because there is no 32-bit version
of the library available on amd64
Regards
Andreas Jochens
diff -urN ../tmp-orig/wine-0.9.20/configure ./configure
--- ../tmp-orig/wine-0.9.20/configure 2006-10-20 08:00:51.000000000 +0000
+++ ./configure 2006-10-20 07:54:08.000000000 +0000
@@ -11810,7 +11810,7 @@
TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}"
{ echo "$as_me:$LINENO: checking whether can link with ICU libraries
$TEST_ICUUC_LIB and $TEST_ICUDATA_LIB" >&5
echo $ECHO_N "checking whether can link with ICU libraries $TEST_ICUUC_LIB and
$TEST_ICUDATA_LIB... $ECHO_C" >&6; }
- LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s"
+ LIBS="-fatal-warnings $saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB
-lstdc++ -lgcc_s"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
diff -urN ../tmp-orig/wine-0.9.20/configure.ac ./configure.ac
--- ../tmp-orig/wine-0.9.20/configure.ac 2006-10-20 08:00:51.000000000
+0000
+++ ./configure.ac 2006-10-20 07:54:08.000000000 +0000
@@ -608,7 +608,7 @@
TEST_ICUUC_LIB="${ICUUC_LIB-${i}uc.a}"
TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}"
AC_MSG_CHECKING(whether can link with ICU libraries $TEST_ICUUC_LIB
and $TEST_ICUDATA_LIB)
- LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s"
+ LIBS="-fatal-warnings $saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB
-lstdc++ -lgcc_s"
AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()],
[AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries
are installed])
AC_SUBST(ICULIBS,"$TEST_ICUUC_LIB $TEST_ICUDATA_LIB
-lstdc++ -lgcc_s")
diff -urN ../tmp-orig/wine-0.9.20/debian/control ./debian/control
--- ../tmp-orig/wine-0.9.20/debian/control 2006-10-20 08:00:51.000000000
+0000
+++ ./debian/control 2006-10-20 07:59:56.000000000 +0000
@@ -19,11 +19,12 @@
libicu36-dev | libicu34-dev (>= 3.4-4) | libicu28-dev | libicu21-dev,
libfontconfig1-dev, libssl-dev, libcapi20-dev (>= 1:3.3.0.20041024-2)
[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libhal-dev, libdbus-1-dev, libgphoto2-2-dev, liblcms1-dev, libldap2-dev,
- libxml2-dev, libxslt1-dev, fontforge, prelink
+ libxml2-dev, libxslt1-dev, fontforge, prelink,
+ libc6-dev-i386 [amd64], ia32-libs [amd64], lib32z1-dev [amd64],
lib32asound2-dev [amd64], lib32ncurses5-dev [amd64]
Standards-Version: 3.6.0
Package: wine
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: ${debconf-depends}, libwine (= ${Source-Version}), xbase-clients (>=
4.0) | xcontrib
Recommends: wine-utils, msttcorefonts
Suggests: wine-doc, binfmt-support
@@ -39,7 +40,7 @@
Wine is often updated.
Package: libwine-dev
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Section: libdevel
Depends: libwine (= ${Source-Version}), libc6-dev
Replaces: libwine (<< 0.0.20010216)
@@ -55,8 +56,8 @@
Package: libwine
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
-Depends: ${debconf-depends}, ${shlibs:Depends}${freetype}
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
+Depends: ${debconf-depends}, ${shlibs:Depends}${freetype}${ia32-libs}
Replaces: libwine0.0.971116, wine (<< 0.9.11-1), libwine-twain (<< 0.9.13)
Conflicts: libwine0.0.971116
Recommends: libwine-print, libwine-gl${icu}
@@ -71,7 +72,7 @@
Package: libwine-alsa
Section: libs
-Architecture: i386 powerpc sparc
+Architecture: amd64 i386 powerpc sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Description: Windows API Implementation (ALSA Sound Module)
This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -83,7 +84,7 @@
Package: libwine-arts
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Replaces: libwine (<< 0.0.20020710)
Description: Windows API Implementation (aRts Sound Module)
@@ -96,7 +97,7 @@
Package: libwine-capi
Section: libs
-Architecture: i386 powerpc sparc
+Architecture: amd64 i386 powerpc sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Description: Windows API Implementation (ISDN Module)
This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -109,7 +110,7 @@
Package: libwine-cms
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Replaces: libwine (<< 0.0.20050830)
Description: Windows API Implementation (Color Management Module)
@@ -123,7 +124,7 @@
Package: libwine-esd
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Description: Windows API Implementation (EsounD Sound Module)
This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -135,7 +136,7 @@
Package: libwine-gl
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Description: Windows API Implementation (OpenGL Module)
This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -148,7 +149,7 @@
Package: libwine-gphoto2
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Description: Windows API Implementation (Camera Module)
This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -161,7 +162,7 @@
Package: libwine-jack
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}${jack}
Description: Windows API Implementation (JACK Sound Module)
This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -173,7 +174,7 @@
Package: libwine-ldap
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Description: Windows API Implementation (LDAP Module)
This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -186,7 +187,7 @@
Package: libwine-nas
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Replaces: libwine (<< 0.0.20020710)
Description: Windows API Implementation (NAS Sound Module)
@@ -199,7 +200,7 @@
Package: libwine-print
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: amd64 i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc
hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc
netbsd-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}${freetype}${cupsys}
Replaces: libwine (<< 0.0.20020710)
Description: Windows API Implementation (Printing Module)
@@ -213,7 +214,7 @@
Package: libwine-sane
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), ${shlibs:Depends}
Description: Windows API Implementation (Scanner Module)
This is a BETA release of Wine, the free MS-Windows API implementation.
@@ -226,7 +227,7 @@
Package: libwine-twain
Section: libs
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine-sane
Suggests: libwine-gphoto2
Description: Windows API Implementation (empty transitional package)
@@ -234,7 +235,7 @@
and libwine-gphoto2 packages. It can safely be removed.
Package: wine-utils
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 powerpc hurd-powerpc
kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
+Architecture: any-amd64 any-i386 any-powerpc any-sparc
Depends: libwine (= ${Source-Version}), wine
Replaces: libwine-dev (<< 0.0.20010216)
Description: Windows API Implementation (Utilities)
diff -urN ../tmp-orig/wine-0.9.20/debian/rules ./debian/rules
--- ../tmp-orig/wine-0.9.20/debian/rules 2006-10-20 08:00:51.000000000
+0000
+++ ./debian/rules 2006-10-20 07:59:37.000000000 +0000
@@ -182,7 +182,9 @@
mv debian/libwine/usr/lib/wine/d3d9* debian/libwine-gl/usr/lib/wine
mv debian/libwine/usr/lib/wine/d3dx8* debian/libwine-gl/usr/lib/wine
mv debian/libwine/usr/lib/wine/glu32* debian/libwine-gl/usr/lib/wine
+ifneq ($(DEB_HOST_ARCH_CPU), amd64)
mv debian/libwine/usr/lib/wine/glut32* debian/libwine-gl/usr/lib/wine
+endif
mv debian/libwine/usr/lib/wine/opengl32* debian/libwine-gl/usr/lib/wine
mv debian/libwine/usr/lib/wine/wined3d* debian/libwine-gl/usr/lib/wine
mv debian/libwine/usr/lib/wine/winejack*
debian/libwine-jack/usr/lib/wine
@@ -247,6 +249,11 @@
dh_installdeb -s
dh_shlibdeps -s -ldlls:libs:
+ # if the distro we're compiling for has ia32-libs, depend on it
+ (dpkg -s ia32-libs >/dev/null && \
+ echo "ia32-libs=, ia32-libs" >> debian/libwine.substvars) || \
+ true
+
# if the distro we're compiling for has freetype, depend on it
(dpkg -s libfreetype6-dev >/dev/null && \
echo "freetype=, libfreetype6" >> debian/libwine.substvars && \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
