[cmake-developers] Fwd: Bug#419007: Patch to stick with lib instead of lib64

Andy Cedilnik andy.cedilnik at kitware.com
Fri May 18 10:16:24 EDT 2007


---------- Forwarded message ----------
From: Michael Tautschnig <tautschn at model.in.tum.de>
Date: May 18, 2007 9:01 AM
Subject: Bug#419007: Patch to stick with lib instead of lib64
To: 419007 at bugs.debian.org


Hi!

The attached patch removes the replacement of lib by lib64 that is performed
within cmake while searching for libraries.

Best,
Michael




-- 
-------------------------------------------
Andy Cedilnik
Kitware Inc.
http://www.kitware.com
Phone: +1 518 371 3971 x110
-------------- next part --------------
diff -urN cmake-2.4.5.orig/debian/changelog cmake-2.4.5/debian/changelog
--- cmake-2.4.5.orig/debian/changelog	2007-05-18 14:41:35.000000000 +0200
+++ cmake-2.4.5/debian/changelog	2007-05-18 14:41:07.000000000 +0200
@@ -1,3 +1,11 @@
+cmake (2.4.5-1.1) unstable; urgency=low
+  
+  * Non-maintainer upload
+  * Debian does not use lib64, it only exists as a symlink (Closes: #419007)
+  * Use chmod a-x instead of chmod -x to avoid FTBFS with stricter umask
+
+ -- Michael Tautschnig <tautschn at model.in.tum.de>  Fri, 18 May 2007 14:21:41 +0200
+
 cmake (2.4.5-1) unstable; urgency=low
 
   * New upstream bugfix release (Closes: #401071)
diff -urN cmake-2.4.5.orig/debian/rules cmake-2.4.5/debian/rules
--- cmake-2.4.5.orig/debian/rules	2007-05-18 14:41:35.000000000 +0200
+++ cmake-2.4.5/debian/rules	2007-05-18 14:40:20.000000000 +0200
@@ -57,10 +57,10 @@
 	echo CMAKE_CXX_FLAGS:STRING=$(CFLAGS) >> Build/CMakeCache.txt
 	(if [[ $(DARTP) == "USE_DART" ]]; then echo BUILDNAME:STRING=cmake_2.2.3-1_$(DARCH).deb >> Build/CMakeCache.txt; fi)
 	(cd Build ; ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man)
-	chmod -x ChangeLog.manual
-	chmod -x Modules/*.cmake Modules/*.cxx Modules/Platform/Windows-gcc.cmake Modules/Platform/Windows-icl.cmake
-	chmod -x Modules/Platform/CYGWIN-g77.cmake Modules/CMakeRCCompiler.cmake.in Modules/CMakeFortranCompiler.cmake.in
-	chmod -x Modules/Platform/*
+	chmod a-x ChangeLog.manual
+	chmod a-x Modules/*.cmake Modules/*.cxx Modules/Platform/Windows-gcc.cmake Modules/Platform/Windows-icl.cmake
+	chmod a-x Modules/Platform/CYGWIN-g77.cmake Modules/CMakeRCCompiler.cmake.in Modules/CMakeFortranCompiler.cmake.in
+	chmod a-x Modules/Platform/*
 	touch configure-stamp
 
 build: configure-stamp build-stamp
diff -urN cmake-2.4.5.orig/Source/cmFindLibraryCommand.cxx cmake-2.4.5/Source/cmFindLibraryCommand.cxx
--- cmake-2.4.5.orig/Source/cmFindLibraryCommand.cxx	2006-12-04 17:03:56.000000000 +0100
+++ cmake-2.4.5/Source/cmFindLibraryCommand.cxx	2007-05-18 14:39:54.000000000 +0200
@@ -64,7 +64,8 @@
     return true;
     }
   // add special 64 bit paths if this is a 64 bit compile.
-  this->AddLib64Paths();
+  // Not on Debian systems
+  // this->AddLib64Paths();
   std::string library;
   for(std::vector<std::string>::iterator i = this->Names.begin();
       i != this->Names.end() ; ++i)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
URL: <http://public.kitware.com/pipermail/cmake-developers/attachments/20070518/5114cf68/attachment.sig>


More information about the cmake-developers mailing list