[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.0-rc1-1-8-gd673fa8
The following commit has been merged in the master branch:
commit b9ac5909e05c0212cd354f540bec6b60b872172b
Author: Ove Kaaven <ovek@arcticnet.no>
Date: Sat May 24 18:05:01 2008 +0200
On amd64, symlink in libraries from ia32-libs for Wine to link against,
to work around ia32-libs not providing the necessary symlinks itself.
(Based on list of libraries provided by Arthur Loiret.)
diff --git a/debian/ia32.libs b/debian/ia32.libs
new file mode 100644
index 0000000..1b21741
--- /dev/null
+++ b/debian/ia32.libs
@@ -0,0 +1,60 @@
+lib/libusb-0.1.so.4 libusb.so
+lib/libcap.so.2 libcap.so
+usr/lib/libGL.so.1 libGL.so
+usr/lib/libGLU.so.1 libGLU.so
+usr/lib/libICE.so.6 libICE.so
+usr/lib/libSM.so.6 libSM.so
+usr/lib/libX11.so.6 libX11.so
+usr/lib/libXau.so.6 libXau.so
+usr/lib/libXcursor.so.1 libXcursor.so
+usr/lib/libXdmcp.so.6 libXdmcp.so
+usr/lib/libXext.so.6 libXext.so
+usr/lib/libXfixes.so.3 libXfixes.so
+usr/lib/libXi.so.6 libXi.so
+usr/lib/libXinerama.so.1 libXinerama.so
+usr/lib/libXmu.so.6 libXmu.so
+usr/lib/libXrandr.so.2 libXrandr.so
+usr/lib/libXrender.so.1 libXrender.so
+usr/lib/libXt.so.6 libXt.so
+usr/lib/libXxf86vm.so.1 libXxf86vm.so
+usr/lib/libartsc.so.0 libartsc.so
+usr/lib/libaudiofile.so.0 libaudiofile.so
+usr/lib/libaudio.so.2 libaudio.so
+usr/lib/libcairo.so.2 libcairo.so
+usr/lib/libesd.so.0 libesd.so
+usr/lib/libexif.so.12 libexif.so
+usr/lib/libfontconfig.so.1 libfontconfig.so
+usr/lib/libfreetype.so.6 libfreetype.so
+usr/lib/libgcrypt.so.11 libgcrypt.so
+usr/lib/libglut.so.3 libglut.so
+usr/lib/libgnutls.so.26 libgnutls.so
+usr/lib/libgpg-error.so.0 libgpg-error.so
+usr/lib/libgphoto2_port.so.0 libgphoto2_port.so
+usr/lib/libgphoto2.so.2 libgphoto2.so
+usr/lib/libieee1284.so.3 libieee1284.so
+usr/lib/libjpeg.so.62 libjpeg.so
+usr/lib/liblber.so.2 liblber.so
+usr/lib/liblcms.so.1 liblcms.so
+usr/lib/libldap_r-2.4.so.2 libldap_r.so
+usr/lib/libldap_r.so.2 libldap_r.so
+usr/lib/libltdl.so.3 libltdl.so
+usr/lib/libsane.so.1 libsane.so
+usr/lib/libsasl2.so.2 libsasl2.so
+usr/lib/libtasn1.so.3 libtasn1.so
+usr/lib/libtiff.so.4 libtiff.so
+usr/lib/libxml2.so.2 libxml2.so
+usr/lib/libxslt.so.1 libxslt.so
+usr/lib/libSDL-1.2.so.0 libSDL-1.2.so
+usr/lib/libpng12.so.0 libpng12.so
+usr/lib/libpng12.so.0 libpng.so
+usr/lib/libcups.so.2 libcups.so
+usr/lib/libpulse.so.0.4.1 libpulse.so
+usr/lib/libpulse-simple.so.0.0.1 libpulse-simple.so
+usr/lib/libssl.so.0.9.8 libssl.so
+usr/lib/libXcomposite.so.1 libXcomposite.so
+usr/lib/libhal.so.1 libhal.so
+usr/lib/libcapi20.so.3 libcapi20.so
+usr/lib/libjack.so.0 libjack.so
+usr/lib/libcrypto.so.0.9.8 libcrypto.so
+usr/lib/libdbus-1.so.3 libdbus-1.so
+usr/lib/libodbc.so.1 libodbc.so
diff --git a/debian/ia32.sh b/debian/ia32.sh
new file mode 100644
index 0000000..2f50a06
--- /dev/null
+++ b/debian/ia32.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+PREFIX="$1"
+DIR="$2"
+echo "Symlinking in ia32-libs..."
+while read LIB NAME; do
+ LIBPATH="$PREFIX/$LIB"
+ LIBNAME="$DIR/$NAME"
+ [ -e "$LIBPATH" ] && [ ! -e "$LIBNAME" ] && ln -s "$LIBPATH" "$LIBNAME"
+done < debian/ia32.libs
+# return success
+true
diff --git a/debian/rules b/debian/rules
index 6c75314..5962705 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ CFLAGS=-O0 -g
else
CFLAGS=-O2 -g
endif
+LDFLAGS=
CONFIGOPTS = --with-x --enable-opengl
@@ -53,18 +54,30 @@ endif
#BUILDS += build64
#NATIVE_BUILD = build64
NATIVE_BUILD = build32
+IA32_LIBS = /emul/ia32-linux
+LDFLAGS += -L$(CURDIR)/lib32
else
BUILDS = build32
NATIVE_BUILD = build32
endif
+configure-ia32: configure-ia32-stamp
+configure-ia32-stamp:
+ dh_testdir
+ifneq (,$(IA32_LIBS))
+ mkdir lib32 || true
+ bash debian/ia32.sh $(IA32_LIBS) lib32
+endif
+ touch configure-ia32-stamp
+
configure-arch32: configure-arch32-stamp
-configure-arch32-stamp:
+configure-arch32-stamp: configure-ia32-stamp
dh_testdir
ifeq (,$(DEB_SAVEBUILD))
mkdir build32 || true
cd build32 && \
CFLAGS="$(CFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" \
../configure --disable-win64 $(CONFIGOPTS) \
--prefix=/usr \
--sysconfdir=/etc \
@@ -79,12 +92,13 @@ endif
touch configure-arch32-stamp
configure-arch64: configure-arch64-stamp
-configure-arch64-stamp:
+configure-arch64-stamp: configure-ia32-stamp
dh_testdir
ifeq (,$(DEB_SAVEBUILD))
mkdir build64 || true
cd build64 && \
CFLAGS="$(CFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" \
../configure --enable-win64 $(CONFIGOPTS) \
--prefix=/usr \
--sysconfdir=/etc \
@@ -160,10 +174,11 @@ endif
clean: clean-arch32 clean-arch64
dh_testdir
dh_testroot
- rm -f install-arch-stamp build-indep-stamp
+ rm -f install-arch-stamp build-indep-stamp configure-ia32-stamp
ifeq (false,$(AMD64_PACK))
rm -f debian/amd64.tar.lzma.uu
endif
+ rm -rf lib32
dh_clean
install-indep: build-indep
--
Debian Wine packaging
Reply to: