From 740d286c8f9b319cd68a4747c5970e4db2f88f78 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Thu, 8 Jul 2010 19:03:55 +0000 Subject: [PATCH] [debian] * remove some files (useless or copyright issue) from the source package. * Use some user defined cflags for cmake. (package will use O2 by default) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3434 96395faa-99c1-11dd-bbfe-3dabce05a288 --- .../create_pcsx2_tarball_from_svn_repository.sh | 9 ++++++++- debian-unstable-upstream/rules | 10 +++++++++- debian-unstable-upstream/rules_fglrx | 10 +++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh index 1792628f85..7c1442fe6f 100755 --- a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh +++ b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh @@ -68,7 +68,9 @@ mkdir -p $ROOT_DIR/plugins (cd $ROOT_DIR/plugins; get_svn_file plugins/CMakeLists.txt; # DVD - get_svn_dir plugins/CDVDnull plugins/CDVDiso; + get_svn_dir plugins/CDVDnull; + # Copyright issue + # get_svn_dir plugins/CDVDnull plugins/CDVDiso; # PAD get_svn_dir plugins/PadNull plugins/onepad; # AUDIO @@ -103,6 +105,11 @@ find $NEW_DIR -name "3rdparty" -exec rm -fr {} \; 2> /dev/null echo "Remove windows file (useless & copyright issue)" find $NEW_DIR -iname "windows" -exec rm -fr {} \; 2> /dev/null rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/Win32" +rm -fr "${NEW_DIR}/tools/GSDumpGUI" +rm -fr "${NEW_DIR}/common/vsprops" +echo "Remove useless file (copyright issue)" +rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders/zlib" +rm -fr "${NEW_DIR}/common/src/Utilities/x86/MemcpyFast.cpp" ## BUILD diff --git a/debian-unstable-upstream/rules b/debian-unstable-upstream/rules index 0c5a2a5d97..097ca86b69 100755 --- a/debian-unstable-upstream/rules +++ b/debian-unstable-upstream/rules @@ -15,6 +15,9 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif +USER_CFLAGS=$(shell dpkg-buildflags --get CFLAGS) +USER_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS) + build: build-stamp build-stamp: dh_testdir @@ -23,7 +26,12 @@ build-stamp: for makefile in `find ./ -name "Makefile"` ; do [ -f $${makefile}.orig ] || mv $${makefile} $${makefile}.orig ; done # Cmake based makefile - cmake CMakeLists.txt -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DCMAKE_BUILD_STRIP=FALSE -DFORCE_INTERNAL_SOUNDTOUCH=FALSE + cmake CMakeLists.txt \ + -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ + -DCMAKE_BUILD_STRIP=FALSE \ + -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \ + -DUSER_CMAKE_C_FLAGS="$(USER_CFLAGS)" \ + -DUSER_CMAKE_CXX_FLAGS="$(USER_CXXFLAGS)" $(MAKE) $(MAKEFLAGS) touch build-stamp diff --git a/debian-unstable-upstream/rules_fglrx b/debian-unstable-upstream/rules_fglrx index 105ccab76a..b0f4e36876 100755 --- a/debian-unstable-upstream/rules_fglrx +++ b/debian-unstable-upstream/rules_fglrx @@ -15,6 +15,9 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif +USER_CFLAGS=$(shell dpkg-buildflags --get CFLAGS) +USER_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS) + build: build-stamp build-stamp: dh_testdir @@ -23,7 +26,12 @@ build-stamp: for makefile in `find ./ -name "Makefile"` ; do [ -f $${makefile}.orig ] || mv $${makefile} $${makefile}.orig ; done # Cmake based makefile - cmake CMakeLists.txt -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DCMAKE_BUILD_STRIP=FALSE -DFORCE_INTERNAL_SOUNDTOUCH=FALSE + cmake CMakeLists.txt \ + -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ + -DCMAKE_BUILD_STRIP=FALSE \ + -DFORCE_INTERNAL_SOUNDTOUCH=FALSE \ + -DUSER_CMAKE_C_FLAGS="$(USER_CFLAGS)" \ + -DUSER_CMAKE_CXX_FLAGS="$(USER_CXXFLAGS)" $(MAKE) $(MAKEFLAGS) touch build-stamp