TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix qt3/tqt3 multiarch on Debian and Ubuntu

Browse Source 
This closes Bug 712
pull/3/head
Timothy Pearson 13 years ago
parent 9c1a064fac
commit 2754bcd235
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
debian/lenny/dependencies/qt3/debian/rules vendored
Unescape View File

@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_OS),hurd) ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++ PLATFORM_ARG = hurd-g++
@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
-I/usr/include/mysql \ -I/usr/include/mysql \
-I/usr/include/freetype2 \ -I/usr/include/freetype2 \
-I`pg_config --includedir` \ -I`pg_config --includedir` \
\ -L/usr/lib/$(DEB_HOST_MULTIARCH)\
-L/usr/lib/$(DEB_HOST_MULTIARCH) \
\ \
-lfontconfig \ -lfontconfig \
-inputmethod \ -inputmethod \

4
debian/lenny/dependencies/tqt3/debian/rules vendored
Unescape View File

@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_OS),hurd) ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++ PLATFORM_ARG = hurd-g++
@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
-I/usr/include/mysql \ -I/usr/include/mysql \
-I/usr/include/freetype2 \ -I/usr/include/freetype2 \
-I`pg_config --includedir` \ -I`pg_config --includedir` \
\ -L/usr/lib/$(DEB_HOST_MULTIARCH)\
-L/usr/lib/$(DEB_HOST_MULTIARCH) \
\ \
-lfontconfig \ -lfontconfig \
-inputmethod \ -inputmethod \

4
debian/squeeze/dependencies/qt3/debian/rules vendored
Unescape View File

@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_OS),hurd) ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++ PLATFORM_ARG = hurd-g++
@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
-I/usr/include/mysql \ -I/usr/include/mysql \
-I/usr/include/freetype2 \ -I/usr/include/freetype2 \
-I`pg_config --includedir` \ -I`pg_config --includedir` \
\ -L/usr/lib/$(DEB_HOST_MULTIARCH)\
-L/usr/lib/$(DEB_HOST_MULTIARCH) \
\ \
-lfontconfig \ -lfontconfig \
-inputmethod \ -inputmethod \

4
debian/squeeze/dependencies/tqt3/debian/rules vendored
Unescape View File

@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_OS),hurd) ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++ PLATFORM_ARG = hurd-g++
@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
-I/usr/include/mysql \ -I/usr/include/mysql \
-I/usr/include/freetype2 \ -I/usr/include/freetype2 \
-I`pg_config --includedir` \ -I`pg_config --includedir` \
\ -L/usr/lib/$(DEB_HOST_MULTIARCH)\
-L/usr/lib/$(DEB_HOST_MULTIARCH) \
\ \
-lfontconfig \ -lfontconfig \
-inputmethod \ -inputmethod \

4
ubuntu/maverick/dependencies/qt3/debian/rules
Unescape View File

@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_OS),hurd) ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++ PLATFORM_ARG = hurd-g++
@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
-I/usr/include/mysql \ -I/usr/include/mysql \
-I/usr/include/freetype2 \ -I/usr/include/freetype2 \
-I`pg_config --includedir` \ -I`pg_config --includedir` \
\ -L/usr/lib/$(DEB_HOST_MULTIARCH)\
-L/usr/lib/$(DEB_HOST_MULTIARCH) \
\ \
-lfontconfig \ -lfontconfig \
-inputmethod \ -inputmethod \

4
ubuntu/maverick/dependencies/tqt3/debian/rules
Unescape View File

@ -13,6 +13,7 @@ export PATH=$(QTDIR)/bin:$(OLD_PATH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_OS),hurd) ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++ PLATFORM_ARG = hurd-g++
@ -90,8 +91,7 @@ CONFIGURE_OPTS = \
-I/usr/include/mysql \ -I/usr/include/mysql \
-I/usr/include/freetype2 \ -I/usr/include/freetype2 \
-I`pg_config --includedir` \ -I`pg_config --includedir` \
\ -L/usr/lib/$(DEB_HOST_MULTIARCH)\
-L/usr/lib/$(DEB_HOST_MULTIARCH) \
\ \
-lfontconfig \ -lfontconfig \
-inputmethod \ -inputmethod \

Write Preview
Loading…
Cancel
Save