Attachment 844150 Details for Bug 1039555 – A patch to change the buildsystem from autotools to cmake

[patch] A patch to change the buildsystem from autotools to cmake

0001-Use-cmake-instead-of-autotools.patch (text/plain), 5.23 KB, created by Tomas Heinrich on 2014-01-01 15:09:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Heinrich

Created: 2014-01-01 15:09:13 UTC

Size: 5.23 KB

patch

obsolete

>From aea348534ce82b4976689ad9ba40c52a802c06a2 Mon Sep 17 00:00:00 2001
>From: Tomas Heinrich <theinric@redhat.com>
>Date: Tue, 31 Dec 2013 19:44:59 +0100
>Subject: [PATCH] Use cmake instead of autotools
>
>Add a patch to correct library path.
>Update Source0 url.
>---
> librabbitmq.spec             | 29 +++++++-------
> rabbitmq-c-0.4.1-cmake.patch | 91 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 104 insertions(+), 16 deletions(-)
> create mode 100644 rabbitmq-c-0.4.1-cmake.patch
>
>diff --git a/librabbitmq.spec b/librabbitmq.spec
>index 55eac6f..44c5df4 100644
>--- a/librabbitmq.spec
>+++ b/librabbitmq.spec
>@@ -10,14 +10,16 @@
> Name:      librabbitmq
> Summary:   Client library for AMQP
> Version:   0.4.1
>-Release:   1%{?dist}
>+Release:   2%{?dist}
> License:   MIT
> Group:     System Environment/Libraries
> URL:       https://github.com/alanxz/rabbitmq-c
> 
>-Source0:   https://github.com/alanxz/rabbitmq-c/archive/rabbitmq-c-%{version}.tar.gz
>+Source0:   https://github.com/alanxz/rabbitmq-c/releases/download/v%{version}/rabbitmq-c-%{version}.tar.gz
>+# Correct installation path, taken from upstream
>+Patch0:    rabbitmq-c-0.4.1-cmake.patch
> 
>-BuildRequires: libtool
>+BuildRequires: cmake
> BuildRequires: python-simplejson
> BuildRequires: openssl-devel
> # For tools
>@@ -59,34 +61,24 @@ amqp-publish        Publish a message on an AMQP server
> 
> %prep
> %setup -q -n rabbitmq-c-%{version}
>+%patch0 -p1
> 
> # Copy sources to be included in -devel docs.
> cp -pr examples Examples
> 
> 
> %build
>-autoreconf -i
>-%configure \
>-   --enable-tools \
>-   --enable-docs  \
>-   --with-ssl=openssl
>-
>-# rpath removal
>-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
>-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
>-
>+%cmake -DBUILD_TOOLS_DOCS=ON .
> make %{_smp_mflags}
> 
> 
> %install
> make install  DESTDIR="%{buildroot}"
> 
>-rm %{buildroot}%{_libdir}/%{name}.la
>-
> 
> %check
> export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
>-make check
>+make test
> 
> 
> %post -p /sbin/ldconfig
>@@ -112,6 +104,11 @@ make check
> 
> 
> %changelog
>+* Tue Dec 31 2013 Remi Collet <remi@fedoraproject.org> - 0.4.1-2
>+- use cmake instead of autotools
>+- add a patch to correct library path
>+- update Source0 url
>+
> * Sat Sep 28 2013 Remi Collet <remi@fedoraproject.org> - 0.4.1-1
> - update to 0.4.1
> - add ssl support
>diff --git a/rabbitmq-c-0.4.1-cmake.patch b/rabbitmq-c-0.4.1-cmake.patch
>new file mode 100644
>index 0000000..1771cc5
>--- /dev/null
>+++ b/rabbitmq-c-0.4.1-cmake.patch
>@@ -0,0 +1,91 @@
>+From 3bf5e2fa491b2977a850bf6ff7fe336eee5c780b Mon Sep 17 00:00:00 2001
>+From: Tomas Heinrich <theinric@redhat.com>
>+Date: Tue, 31 Dec 2013 19:26:12 +0100
>+Subject: [PATCH] Adjust installation paths
>+
>+Changes taken from upstream's master branch
>+---
>+ CMakeLists.txt             | 12 +++++++-----
>+ librabbitmq/CMakeLists.txt | 10 +++++-----
>+ 2 files changed, 12 insertions(+), 10 deletions(-)
>+
>+diff --git a/CMakeLists.txt b/CMakeLists.txt
>+index 6f74ea0..a93c472 100644
>+--- a/CMakeLists.txt
>++++ b/CMakeLists.txt
>+@@ -56,6 +56,7 @@ include(CheckFunctionExists)
>+ include(CheckSymbolExists)
>+ include(CheckLibraryExists)
>+ include(CMakePushCheckState)
>++include(GNUInstallDirs)
>+ 
>+ # Detect if we need to link against a socket library:
>+ cmake_push_check_state()
>+@@ -295,10 +296,6 @@ if (BUILD_API_DOCS)
>+     )
>+ endif ()
>+ 
>+-set(prefix ${CMAKE_INSTALL_PREFIX})
>+-set(exec_prefix "\${prefix}")
>+-set(libdir "\${exec_prefix}/lib")
>+-set(includedir "\${prefix}/include")
>+ set(libs_private ${SOCKET_LIBRARIES} ${LIBRT})
>+ if (ENABLE_SSL_SUPPORT)
>+   if (SSL_ENGINE STREQUAL "OpenSSL")
>+@@ -309,12 +306,17 @@ if (ENABLE_SSL_SUPPORT)
>+   endif()
>+ endif()
>+ 
>++set(prefix ${CMAKE_INSTALL_PREFIX})
>++set(exec_prefix "\${prefix}")
>++set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
>++set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
>++
>+ configure_file(cmake/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/librabbitmq/config.h)
>+ configure_file(librabbitmq.pc.in ${CMAKE_CURRENT_BINARY_DIR}/librabbitmq.pc @ONLY)
>+ 
>+ install(FILES
>+   ${CMAKE_CURRENT_BINARY_DIR}/librabbitmq.pc
>+-  DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
>++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
>+   )
>+ 
>+ if (BUILD_SHARED_LIBS)
>+diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt
>+index 613f138..4568781 100644
>+--- a/librabbitmq/CMakeLists.txt
>++++ b/librabbitmq/CMakeLists.txt
>+@@ -143,9 +143,9 @@ if (BUILD_SHARED_LIBS)
>+     endif (WIN32)
>+ 
>+     install(TARGETS rabbitmq
>+-        RUNTIME DESTINATION bin
>+-        LIBRARY DESTINATION lib
>+-        ARCHIVE DESTINATION lib
>++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
>++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
>++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
>+         )
>+     install_pdb(rabbitmq)
>+ 
>+@@ -165,7 +165,7 @@ if (BUILD_STATIC_LIBS)
>+     endif (WIN32)
>+ 
>+     install(TARGETS rabbitmq-static
>+-        ARCHIVE DESTINATION lib
>++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
>+         )
>+     install_pdb(rabbitmq-static)
>+ 
>+@@ -180,7 +180,7 @@ install(FILES
>+   amqp_tcp_socket.h
>+   ${AMQP_SSL_SOCKET_H_PATH}
>+   ${STDINT_H_INSTALL_FILE}
>+-  DESTINATION include
>++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
>+     )
>+ 
>+ set(RMQ_LIBRARY_TARGET ${RMQ_LIBRARY_TARGET} PARENT_SCOPE)
>+-- 
>+1.8.4.3
>+
>-- 
>1.8.4.3
>

Actions: View | Diff

Attachments on bug 1039555: 844150