Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use quilt.make rather than custom quilt patch implementation.

Browse Source
This commit is contained in:
Modestas Vainius 2009-08-08 11:02:57 +03:00
parent a58c400f44
commit 857598fc78
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -4,8 +4,9 @@ cmake (2.6.4-2) UNRELEASED; urgency=low
(Closes: #538864). (Closes: #538864).
* Fix bashisms in CMake scripts (Closes: #530056). * Fix bashisms in CMake scripts (Closes: #530056).
* Merge in 2.6.0-6 debian/changelog. * Merge in 2.6.0-6 debian/changelog.
* Use quilt.make rather than custom quilt patch implementation.
-- Modestas Vainius <modestas@vainius.eu> Sat, 08 Aug 2009 10:58:18 +0300 -- Modestas Vainius <modestas@vainius.eu> Sat, 08 Aug 2009 11:02:22 +0300
cmake (2.6.4-1) unstable; urgency=low cmake (2.6.4-1) unstable; urgency=low

17
debian/rules vendored
View File

@ -1,12 +1,13 @@
#!/usr/bin/make -f #!/usr/bin/make -f
include /usr/share/quilt/quilt.make
# The next line will cause Dart to be used if it is installed... # The next line will cause Dart to be used if it is installed...
#USE_DARTP:=$(shell if [ -d /usr/share/Dart ]; then echo true; fi ) #USE_DARTP:=$(shell if [ -d /usr/share/Dart ]; then echo true; fi )
USE_DARTP:= USE_DARTP:=
DARCH := $(shell dpkg --print-installation-architecture) DARCH := $(shell dpkg --print-installation-architecture)
CFLAGS := -Wall -g $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),-O0,-O2) CFLAGS := -Wall -g $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),-O0,-O2)
QUILT_CALL := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
BUILD_FLAGS_FILE := build-flags.cmake BUILD_FLAGS_FILE := build-flags.cmake
# Hack for parisc64 to close bug #133696 # Hack for parisc64 to close bug #133696
@ -14,14 +15,6 @@ ifeq ($(shell arch),parisc64)
CFLAGS += -ffunction-sections CFLAGS += -ffunction-sections
endif endif
patch: patch-stamp
patch-stamp:
$(QUILT_CALL) push -a || test $$? = 2
touch $@
unpatch:
$(QUILT_CALL) pop -a -R || test $$? = 2
$(BUILD_FLAGS_FILE): $(BUILD_FLAGS_FILE):
touch $@ touch $@
echo 'set(CMAKE_SKIP_RPATH YES CACHE BOOL "Skip rpath" FORCE)' >> $@ echo 'set(CMAKE_SKIP_RPATH YES CACHE BOOL "Skip rpath" FORCE)' >> $@
@ -49,7 +42,7 @@ configure-stamp: $(BUILD_FLAGS_FILE)
chmod -x Modules/*.cmake Modules/*.cmake.in Modules/*.cxx Modules/Platform/* chmod -x Modules/*.cmake Modules/*.cmake.in Modules/*.cxx Modules/Platform/*
touch $@ touch $@
build: patch-stamp configure-stamp build-stamp build: $(QUILT_STAMPFN) configure-stamp build-stamp
build-stamp: build-stamp:
dh_testdir dh_testdir
cd Build && $(MAKE) $(if $(USE_DARTP),Experimental && $(MAKE) ExperimentalSubmit) cd Build && $(MAKE) $(if $(USE_DARTP),Experimental && $(MAKE) ExperimentalSubmit)
@ -58,7 +51,7 @@ build-stamp:
clean: unpatch clean: unpatch
dh_testdir dh_testdir
dh_testroot dh_testroot
rm -rf .pc build-stamp configure-stamp patch-stamp $(BUILD_FLAGS_FILE) rm -rf build-stamp configure-stamp $(BUILD_FLAGS_FILE)
rm -rf Build rm -rf Build
dh_clean dh_clean
@ -98,4 +91,4 @@ binary-arch binary-indep: build install
dh_builddeb dh_builddeb
binary: binary-indep binary-arch binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch .PHONY: build clean binary-indep binary-arch binary install configure