Alexander Pyhalov
2017-11-16 1178f3426b7db71ac7c438420049e36167692611
libxml2: xml2-config shouldn't add -R/usr/lib to --libs
1 files added
1 files modified
34 ■■■■■ changed files
components/library/libxml2/Makefile 1 ●●●● patch | view | raw | blame | history
components/library/libxml2/patches/01-no-rpath.patch 33 ●●●●● patch | view | raw | blame | history
components/library/libxml2/Makefile
@@ -28,6 +28,7 @@
COMPONENT_NAME=        libxml2
COMPONENT_VERSION=    2.9.7
COMPONENT_REVISION=    1
COMPONENT_PROJECT_URL=    http://xmlsoft.org/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
components/library/libxml2/patches/01-no-rpath.patch
New file
@@ -0,0 +1,33 @@
Remove -R/usr/lib from xml2-config output
--- libxml2-2.9.7/xml2-config.in.1    2017-11-16 17:09:21.221320478 +0000
+++ libxml2-2.9.7/xml2-config.in    2017-11-16 17:18:03.100961204 +0000
@@ -82,17 +82,24 @@
            ;;
     --libs)
-        if [ "`uname`" = "Linux" ]
-    then
+        case "`uname`" in
+    "SunOS")
+        echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+        break
+        ;;
+        "Linux")
         if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
         then
         echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
         else
         echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
         fi
-    else
+            break
+            ;;
+    *)
         echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
-    fi
+        ;;
+    esac
            ;;
     *)