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

Drop some redundant build options from debian/rules.

Browse Source
This commit is contained in:
Felix Geyer 2014-08-03 19:34:01 +02:00
parent 7669821758
commit 8bbb2337e9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -11,6 +11,7 @@ cmake (2.8.12.2-1) UNRELEASED; urgency=medium
* Add lintian override for source-is-missing tags. * Add lintian override for source-is-missing tags.
These are just binary test files used by the test suite to verify that These are just binary test files used by the test suite to verify that
changing the RPATH works fine. changing the RPATH works fine.
* Drop some redundant build options from debian/rules.
-- Felix Geyer <fgeyer@debian.org> Sun, 03 Aug 2014 10:02:57 +0200 -- Felix Geyer <fgeyer@debian.org> Sun, 03 Aug 2014 10:02:57 +0200

4
debian/rules vendored
View File

@ -27,8 +27,6 @@ $(BUILD_FLAGS_FILE) verify-build-flags:
$(call $(flag_action),BUILD_CursesDialog,ON,"Build curses GUI") $(call $(flag_action),BUILD_CursesDialog,ON,"Build curses GUI")
$(call $(flag_action),BUILD_QtDialog,ON,"Build Qt4 GUI") $(call $(flag_action),BUILD_QtDialog,ON,"Build Qt4 GUI")
# $(call $(flag_action),BUILD_DOCUMENTATION,ON) # $(call $(flag_action),BUILD_DOCUMENTATION,ON)
$(call $(flag_action),CMAKE_USE_SYSTEM_LIBARCHIVE,ON)
$(call $(flag_action),CMAKE_USE_SYSTEM_BZIP2,ON)
$(BUILD_FLAGS_FILE): flag_action := set_build_flag $(BUILD_FLAGS_FILE): flag_action := set_build_flag
verify-build-flags: flag_action := verify_build_flag verify-build-flags: flag_action := verify_build_flag
@ -37,7 +35,7 @@ verify-build-flags: flag_action := verify_build_flag
override_dh_auto_configure: $(BUILD_FLAGS_FILE) override_dh_auto_configure: $(BUILD_FLAGS_FILE)
rm -rf Build && mkdir -p Build rm -rf Build && mkdir -p Build
cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \ cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \
--init=../$(BUILD_FLAGS_FILE) --system-libs $(CONFIGURE_PARALLEL) \ --init=../$(BUILD_FLAGS_FILE) --system-libs \
$(BOOTSTRAP_PARALLEL) --verbose $(BOOTSTRAP_PARALLEL) --verbose
override_dh_auto_test: override_dh_auto_test: