Mercurial > mxe-octave

view src/vmime-1-fixes.patch @ 4654:b9e4ebcad82f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disable doc extraction for optim package Disable the rules for extracting doc strings because they don't work when cross compiling. Our patches to the source files don't touch the doc strings, so there is no need to update them anyway.
author John W. Eaton <jwe@octave.org>
date Tue, 10 Apr 2018 07:50:10 -0400
parents 053e00ca567e
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

From f74fad8e74da1a17ca90046d735e666bee767722 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 12 Nov 2012 12:28:25 +0100
Subject: [PATCH 1/2] disable shared libs


diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5be9ca3..ce0fc09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,21 +81,6 @@ IF(UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_v
 	ENDIF()
 ENDIF()
 
-# Shared library
-ADD_LIBRARY(
-	${VMIME_LIBRARY_NAME}
-	SHARED
-	${VMIME_LIBRARY_SRC_FILES}
-	${VMIME_LIBRARY_INCLUDE_FILES}
-)
-
-SET_TARGET_PROPERTIES(
-	${VMIME_LIBRARY_NAME}
-	PROPERTIES
-	VERSION    "${VMIME_VERSION}"
-	SOVERSION  "${VMIME_API_VERSION}"
-)
-
 # Static library
 #
 # Note: cannot have two targets with the same name so the static version has
@@ -115,19 +100,12 @@ SET_TARGET_PROPERTIES(
 
 # These next two lines are required but it is unclear exactly what they do.
 # The CMake FAQ mentions they are necessary and it does not work otherwise.
-SET_TARGET_PROPERTIES(${VMIME_LIBRARY_NAME} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 SET_TARGET_PROPERTIES(${VMIME_LIBRARY_NAME}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
 SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
 
 # Installation of libraries
 INSTALL(
-	TARGETS ${VMIME_LIBRARY_NAME}
-	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sharedlibs
-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sharedlibs
-)
-
-INSTALL(
 	TARGETS ${VMIME_LIBRARY_NAME}-static
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT staticlibs
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT staticlibs
@@ -215,11 +193,7 @@ SET(CPACK_SOURCE_IGNORE_FILES          "\\\\.git;~$;build/")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME     ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
 
 # Set components
-SET(CPACK_COMPONENTS_ALL sharedlibs staticlibs headers)
-
-SET(CPACK_COMPONENT_SHAREDLIBS_DISPLAY_NAME "Shared libraries")
-SET(CPACK_COMPONENT_SHAREDLIBS_DESCRIPTION
-	"Shared library for general use.")
+SET(CPACK_COMPONENTS_ALL staticlibs headers)
 
 SET(CPACK_COMPONENT_STATICLIBS_DISPLAY_NAME "Static libraries")
 SET(CPACK_COMPONENT_STATICLIBS_DESCRIPTION
@@ -229,7 +203,6 @@ SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers")
 SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
 	"C/C++ header files.")
 
-SET(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
 SET(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
 SET(CPACK_COMPONENT_HEADERS_GROUP    "Development")
 SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "")
@@ -431,12 +404,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
 		${GSASL_INCLUDE_DIR}
 	)
 
-	TARGET_LINK_LIBRARIES(
-		${VMIME_LIBRARY_NAME}
-		${TARGET_LINK_LIBRARIES}
-		${GSASL_LIBRARIES}
-	)
-
 	SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GSASL_LIBRARIES}")
 	SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GSASL_INCLUDE_DIR}")
 	SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl")
@@ -488,12 +455,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
 			${GNUTLS_LIBRARY_DIRS}
 		)
 
-		TARGET_LINK_LIBRARIES(
-			${VMIME_LIBRARY_NAME}
-			${TARGET_LINK_LIBRARIES}
-			${GNUTLS_LIBRARY}
-		)
-
 		SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GNUTLS_LIBRARY_DIRS} ${GNUTLS_LIBRARY}")
 		SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GNUTLS_INCLUDE_DIR}")
 		SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgnutls")
@@ -505,12 +466,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
 			${OPENSSL_INCLUDE_DIR}
 		)
 
-		TARGET_LINK_LIBRARIES(
-			${VMIME_LIBRARY_NAME}
-			${TARGET_LINK_LIBRARIES}
-			${OPENSSL_LIBRARIES}
-		)
-
 		SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${OPENSSL_LIBRARIES}")
 		SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${OPENSSL_INCLUDE_DIR}")
 		SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libopenssl")
@@ -534,12 +489,6 @@ INCLUDE_DIRECTORIES(
 	${ICONV_INCLUDE_DIR}
 )
 
-TARGET_LINK_LIBRARIES(
-	${VMIME_LIBRARY_NAME}
-	${TARGET_LINK_LIBRARIES}
-	${ICONV_LIBRARIES}
-)
-
 
 ##############################################################################
 # Platform
-- 
1.7.10.4


From 739e6b49b1f421fa39e2e3e292932ff5c200626d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 12 Nov 2012 13:58:12 +0100
Subject: [PATCH 2/2] add private dependencies to .pc file


diff --git a/libvmime.pc.in b/libvmime.pc.in
index 5745c52..cea2927 100644
--- a/libvmime.pc.in
+++ b/libvmime.pc.in
@@ -7,6 +7,8 @@ Name: @VMIME_LIBRARY_NAME@
 Description: @VMIME_PACKAGE_DESCRIPTION@
 Version: @VMIME_PACKAGE_VERSION@
 Requires: @VMIME_PKGCONFIG_REQUIRES@
+Requires.private: gnutls libgsasl
 Libs: -L${libdir} -lvmime @VMIME_PKGCONFIG_LIBS@
+Libs.private: -liconv
 Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@
 
-- 
1.7.10.4