Merge pull request #1775 from davidlt/updates-from-next

GDB, SQLite, CMake, CGAL, libxslt updates
cms-sw · Sep 1, 2015 · 4e729ae · 4e729ae
2 parents f8d68e9 + 9222c4d
commit 4e729ae
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 49 deletions.
diff --git a/cgal-4.2-cmake-string-replace.patch b/cgal-4.2-cmake-string-replace.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6caf13a..48f010a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -116,7 +116,7 @@ foreach(package ${CGAL_CONFIGURED_PACKAGES})
+   file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
+   foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE})
+     string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile})
+-    string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
++    string(REPLACE "/CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
+     if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL")
+
+      message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected")
diff --git a/cgal.spec b/cgal.spec
@@ -1,6 +1,7 @@
 ### RPM external cgal 4.2
 
 Source: https://gforge.inria.fr/frs/download.php/32360/%{n}-%{realversion}.tar.bz2
+Patch0: cgal-4.2-cmake-string-replace
 
 BuildRequires: cmake
 Requires: gmp-static mpfr-static
@@ -19,6 +20,7 @@ Requires: boost zlib
 
 %prep
 %setup -n CGAL-%{realversion}
+%patch0 -p1
 
 %build
 

diff --git a/cmake-2.8.9-darwin-no-long-double.patch b/cmake-2.8.9-darwin-no-long-double.patch
diff --git a/cmake.spec b/cmake.spec
@@ -1,23 +1,10 @@
-### RPM external cmake 2.8.10
+### RPM external cmake 3.3.0
 %define downloaddir %(echo %realversion | cut -d. -f1,2)
 Source: http://www.cmake.org/files/v%{downloaddir}/%n-%realversion.tar.gz
-%define online %(case %cmsplatf in (*onl_*_*) echo true;; (*) echo false;; esac)
-Patch1: cmake-2.8.9-darwin-no-long-double
-Requires: bz2lib curl expat
-
-#We are using system zlib for the online builds:
-%if "%online" != "true"
-Requires: zlib
-%endif
+Requires: bz2lib curl expat zlib
 
 %prep
-
 %setup -n cmake-%realversion
-# This patch disables the warning about long doubles that some
-# macosx compilers emit. Even if it matters only for macosx,
-# we apply it anyway to avoid discrepancies and to avoid that 
-# it's left behind if cmake version is changed. 
-%patch1 -p1
 
 %build
 cat > build-flags.cmake <<- EOF 

diff --git a/gdb-disable-makeinfo.patch b/gdb-disable-makeinfo.patch
@@ -0,0 +1,44 @@
+diff --git a/configure b/configure
+index 64d287d..ae1d2b8 100755
+--- a/configure
++++ b/configure
+@@ -8038,21 +8038,26 @@ fi
+ done
+ test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo"
+
+-case " $build_configdirs " in
+-  *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
+-  *)
++if test "${MAKEINFO}" = "true"; then
++  # Disable makeinfo if requested
++  MAKEINFO=true
++else
++  case " $build_configdirs " in
++    *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
++    *)
+
+-    # For an installed makeinfo, we require it to be from texinfo 4.7 or
+-    # higher, else we use the "missing" dummy.
+-    if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+-      :
+-    else
+-      MAKEINFO="$MISSING makeinfo"
+-    fi
+-    ;;
++      # For an installed makeinfo, we require it to be from texinfo 4.7 or
++      # higher, else we use the "missing" dummy.
++      if ${MAKEINFO} --version \
++         | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
++        :
++      else
++        MAKEINFO="$MISSING makeinfo"
++      fi
++      ;;
+
+-esac
++  esac
++fi
+
+ # FIXME: expect and dejagnu may become build tools?
+
diff --git a/gdb.spec b/gdb.spec
@@ -1,12 +1,13 @@
-### RPM external gdb 7.8.1
+### RPM external gdb 7.9.1
 Source: http://ftp.gnu.org/gnu/%{n}/%{n}-%{realversion}.tar.gz
 Patch0: gdb-7.6-fix-pythonhome
+Patch1: gdb-disable-makeinfo
 Requires: python ncurses zlib xz expat
 
 %prep
 %setup -n %n-%realversion
 %patch0 -p1
-
+%patch1 -p1
 
 %build
 export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
@@ -20,7 +21,8 @@ export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
             --with-lzma=yes \
             --with-liblzma-prefix=${XZ_ROOT} \
             LDFLAGS="-L${PYTHON_ROOT}/lib -L${NCURSES_ROOT}/lib -L${ZLIB_ROOT}/lib -L${EXPAT_ROOT}/lib -L${XZ_ROOT}/lib" \
-            CFLAGS="-Wno-error=strict-aliasing -I${PYTHON_ROOT}/include -I${NCURSES_ROOT}/include -I${ZLIB_ROOT}/include -I${EXPAT_ROOT}/include -I${XZ_ROOT}/include"
+            CFLAGS="-Wno-error=strict-aliasing -I${PYTHON_ROOT}/include -I${NCURSES_ROOT}/include -I${ZLIB_ROOT}/include -I${EXPAT_ROOT}/include -I${XZ_ROOT}/include" \
+            MAKEINFO=true
 make %makeprocesses
 
 %install

diff --git a/libxslt.spec b/libxslt.spec
@@ -11,7 +11,12 @@ BuildRequires: autotools
 %setup -n %{n}-%{realversion}
 
 %build
-./autogen.sh --prefix=%{i} --with-libxml-prefix=$LIBXML2_ROOT --with-libxml-include-prefix=$LIBXML2_ROOT/include  --with-libxml-libs-prefix=$LIBXML2_ROOT/lib
+./autogen.sh \
+  --prefix=%{i} \
+  --with-libxml-prefix=$LIBXML2_ROOT \
+  --with-libxml-include-prefix=$LIBXML2_ROOT/include \
+  --with-libxml-libs-prefix=$LIBXML2_ROOT/lib \
+  --without-crypto
 make
 
 %install

diff --git a/sqlite.spec b/sqlite.spec
@@ -1,8 +1,8 @@
-### RPM external sqlite 3.7.17
-Source: http://www.sqlite.org/2013/sqlite-autoconf-3071700.tar.gz
+### RPM external sqlite 3.8.11.1
+Source: https://www.sqlite.org/2015/sqlite-autoconf-3081101.tar.gz
 
 %prep
-%setup -n sqlite-autoconf-3071700
+%setup -n sqlite-autoconf-3081101
 
 %build
 ./configure --build="%{_build}" --host="%{_host}" --prefix=%{i} \