[137386] trunk/dports/devel/libsolv
cal at macports.org
cal at macports.org
Wed Jun 10 16:55:04 PDT 2015
Revision: 137386
https://trac.macports.org/changeset/137386
Author: cal at macports.org
Date: 2015-06-10 16:55:04 -0700 (Wed, 10 Jun 2015)
Log Message:
-----------
libsolv: update to 0.6.11, drop patch integrated upstream
Modified Paths:
--------------
trunk/dports/devel/libsolv/Portfile
Added Paths:
-----------
trunk/dports/devel/libsolv/files/0001-Fix-manpage-install-dir.patch
Removed Paths:
-------------
trunk/dports/devel/libsolv/files/0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch
trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch
Modified: trunk/dports/devel/libsolv/Portfile
===================================================================
--- trunk/dports/devel/libsolv/Portfile 2015-06-10 23:30:04 UTC (rev 137385)
+++ trunk/dports/devel/libsolv/Portfile 2015-06-10 23:55:04 UTC (rev 137386)
@@ -5,9 +5,9 @@
PortGroup github 1.0
PortGroup cmake 1.0
-github.setup openSUSE libsolv 0.6.10
-checksums rmd160 8d01483fbc8fc1b7661d42c0701ae6aaf01a67b2 \
- sha256 a9c527d124edf4b3ba3bda7df5badf1f61a561d516ad47a222159f2a5b2b406e
+github.setup openSUSE libsolv 0.6.11
+checksums rmd160 0a33039dbb6599a53c5c515d8b4240be7ba54e2e \
+ sha256 1439970bb2ce8ae0d9d9ed29eb3196f66572dae7aa7984bee030d8db0ad06115
maintainers cal openmaintainer
categories devel math
@@ -18,8 +18,7 @@
long_description ${description}
patch.pre_args -p1
-patchfiles 0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch \
- 0002-Fix-manpage-install-dir.patch
+patchfiles 0001-Fix-manpage-install-dir.patch
cmake.out_of_source yes
configure.args-append \
Deleted: trunk/dports/devel/libsolv/files/0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch
===================================================================
--- trunk/dports/devel/libsolv/files/0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch 2015-06-10 23:30:04 UTC (rev 137385)
+++ trunk/dports/devel/libsolv/files/0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch 2015-06-10 23:55:04 UTC (rev 137386)
@@ -1,78 +0,0 @@
-From 81362a2fd662f912ce5a2cf9d7c678faf3cbf991 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <neverpanic at gmail.com>
-Date: Mon, 11 May 2015 19:54:51 +0200
-Subject: [PATCH] Avoid linker flags when not available, fixes OS X
-
-The build currently fails on OS X because the OS X linker ld64 does not
-support --as-needed or --version-script. Fix this by checking whether
-these flags are supported by the currently used linker and only passing
-them if they are.
----
- CMakeLists.txt | 13 +++++++++++++
- ext/CMakeLists.txt | 2 ++
- src/CMakeLists.txt | 2 ++
- 3 files changed, 17 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab3fec9..7b43fd3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,6 +206,17 @@ CHECK_FUNCTION_EXISTS (fopencookie HAVE_FOPENCOOKIE)
- CHECK_FUNCTION_EXISTS (funopen HAVE_FUNOPEN)
- TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
-
-+INCLUDE (CMakePushCheckState)
-+INCLUDE (CheckCCompilerFlag)
-+MACRO (check_linker_flag FLAG VAR)
-+ cmake_push_check_state(RESET)
-+ set(CMAKE_REQUIRED_FLAGS "${FLAG}")
-+ check_c_compiler_flag("" "${VAR}")
-+ cmake_pop_check_state()
-+ENDMACRO (check_linker_flag)
-+check_linker_flag("-Wl,--as-needed" HAS_LINKER_AS_NEEDED)
-+check_linker_flag("-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/libsolv.ver" HAS_LINKER_VERSION_SCRIPT)
-+
- # should create config.h with #cmakedefine instead...
- FOREACH (VAR HAVE_STRCHRNUL HAVE_FOPENCOOKIE HAVE_FUNOPEN WORDS_BIGENDIAN
- HAVE_RPM_DB_H HAVE_PGPDIGGETPARAMS
-@@ -307,7 +318,9 @@ ENDIF (ENABLE_RPMDB)
- IF (ENABLE_HAIKU)
- SET (SYSTEM_LIBRARIES ${HAIKU_SYSTEM_LIBRARIES} ${SYSTEM_LIBRARIES})
- ENDIF (ENABLE_HAIKU)
-+IF (HAS_LINKER_AS_NEEDED)
- SET (SYSTEM_LIBRARIES "-Wl,--as-needed" ${SYSTEM_LIBRARIES})
-+ENDIF (HAS_LINKER_AS_NEEDED)
-
- ADD_SUBDIRECTORY (src)
- ADD_SUBDIRECTORY (ext)
-diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
-index bdf949d..7fcf14f 100644
---- a/ext/CMakeLists.txt
-+++ b/ext/CMakeLists.txt
-@@ -112,7 +112,9 @@ IF (ENABLE_APPDATA)
- ENDIF (ENABLE_APPDATA)
-
- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+IF (HAVE_LINKER_VERSION_SCRIPT)
- SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINK_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/ext/libsolvext.ver")
-+ENDIF (HAVE_LINKER_VERSION_SCRIPT)
-
- IF (DISABLE_SHARED)
- ADD_LIBRARY (libsolvext STATIC ${libsolvext_SRCS})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b78a82a..f60853e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -28,7 +28,9 @@ SET (libsolv_HEADERS
- chksum.h dataiterator.h ${CMAKE_BINARY_DIR}/src/solvversion.h)
-
- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+IF (HAVE_LINKER_VERSION_SCRIPT)
- SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINK_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/src/libsolv.ver")
-+ENDIF (HAVE_LINKER_VERSION_SCRIPT)
-
- IF (DISABLE_SHARED)
- ADD_LIBRARY (libsolv STATIC ${libsolv_SRCS})
---
-2.4.0
-
Copied: trunk/dports/devel/libsolv/files/0001-Fix-manpage-install-dir.patch (from rev 137379, trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch)
===================================================================
--- trunk/dports/devel/libsolv/files/0001-Fix-manpage-install-dir.patch (rev 0)
+++ trunk/dports/devel/libsolv/files/0001-Fix-manpage-install-dir.patch 2015-06-10 23:55:04 UTC (rev 137386)
@@ -0,0 +1,10 @@
+--- ./CMakeLists.txt.orig 2015-05-11 20:11:58.000000000 +0200
++++ ./CMakeLists.txt 2015-05-11 20:12:36.000000000 +0200
+@@ -58,6 +58,7 @@
+ IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
+ SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
+ ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
++SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
+ MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}")
+
+ ####################################################################
Deleted: trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch
===================================================================
--- trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch 2015-06-10 23:30:04 UTC (rev 137385)
+++ trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch 2015-06-10 23:55:04 UTC (rev 137386)
@@ -1,10 +0,0 @@
---- ./CMakeLists.txt.orig 2015-05-11 20:11:58.000000000 +0200
-+++ ./CMakeLists.txt 2015-05-11 20:12:36.000000000 +0200
-@@ -58,6 +58,7 @@
- IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
- SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
- ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
-+SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
- MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}")
-
- ####################################################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150610/8d3b7b1c/attachment-0001.html>
More information about the macports-changes
mailing list