Merge pull request #1583 from hadfl/pkgconfig

add runtime linker option to pkg-config files

Author: citrus-it

build/alpine/patches/autoreconf.patch

@@ -0,0 +1,12 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
+--- a~/configure.ac	1970-01-01 00:00:00
++++ a/configure.ac	1970-01-01 00:00:00
+@@ -58,7 +58,7 @@ AC_PATH_PROG(MAKE, make)
+ 
+ dnl COMPILE-TIME OPTIONS
+ 
+-AM_GNU_GETTEXT_VERSION([0.16.1])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
+ AM_GNU_GETTEXT([external])
+ 
+ dnl enable dmalloc per http://dmalloc.com

build/alpine/patches/lib.patch

@@ -1,7 +1,7 @@
-diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
+diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
 --- a~/configure.ac	1970-01-01 00:00:00
 +++ a/configure.ac	1970-01-01 00:00:00
-@@ -1076,10 +1076,10 @@ else
+@@ -1035,10 +1035,10 @@ else
      ])
 
     if test -n "$alpine_LDAPINCLUDE" ; then

build/alpine/patches/series

@@ -1,2 +1,3 @@
 lib.patch
 uuid.patch
+autoreconf.patch

build/alpine/patches/uuid.patch

@@ -6,10 +6,9 @@ of calls to random(), which is seeded.
 
 Duplicate message IDs have been seen in the wild, use libuuid instead.
 
-diff --git a/imap/src/c-client/oauth2_aux.c b/imap/src/c-client/oauth2_aux.c
-index d2ad6ce..ca0fadb 100644
---- a/imap/src/c-client/oauth2_aux.c
-+++ b/imap/src/c-client/oauth2_aux.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/imap/src/c-client/oauth2_aux.c a/imap/src/c-client/oauth2_aux.c
+--- a~/imap/src/c-client/oauth2_aux.c	1970-01-01 00:00:00
++++ a/imap/src/c-client/oauth2_aux.c	1970-01-01 00:00:00
 @@ -24,6 +24,8 @@
  #include "json.h"
  #include "oauth2_aux.h"
@@ -19,7 +18,7 @@ index d2ad6ce..ca0fadb 100644
  OA2_type oauth2_find_extra_parameter(OAUTH2_S *, char *);
  JSON_S *oauth2_json_reply(OAUTH2_SERVER_METHOD_S, OAUTH2_S *, int *);
  char *xoauth2_server(char *, char *);
-@@ -148,25 +150,13 @@
+@@ -148,25 +150,13 @@ void oauth2_login_hint(OAUTH2_S *oauth2,
   */
  char *oauth2_generate_state(void)
  {

lib/functions.sh

@@ -177,6 +177,10 @@ EOM
 #############################################################################
 # Log output of a command to a file
 #############################################################################
+pipelog() {
+    $TEE -a $LOGFILE 2>&1
+}
+
 logcmd() {
     typeset preserve_stdout=0
     [ "$1" = "-p" ] && shift && preserve_stdout=1
@@ -190,18 +194,14 @@ logcmd() {
     else
         if [ "$preserve_stdout" = 0 ]; then
             echo Running: "$@"
-            "$@" | $TEE -a $LOGFILE 2>&1
+            "$@" | pipelog
             return ${PIPESTATUS[0]}
         else
             "$@"
         fi
     fi
 }
 
-pipelog() {
-    $TEE -a $LOGFILE 2>&1
-}
-
 c_highlight="`$TPUT setaf 2`"
 c_error="`$TPUT setaf 1`"
 c_note="`$TPUT setaf 6`"
@@ -2755,6 +2755,30 @@ make_install() {
             $MAKE_INSTALL_TARGET || logerr "--- Make install failed"
     fi
     hook post_install $arch
+
+    typeset tf=$TMPDIR/pkgconfig.fix
+    : > $tf
+    logmsg "--- fixing runtime path linker option in pkg-config files"
+    while read f; do
+        logcmd $RM -f $f.orig
+        $SED -Ei.orig -e '
+            # If the line already contains -Wl,-R, next!
+            /-Wl,-R/n
+            /^Libs:/ {
+                # Replace any -R with the more widely accepted -Wl,-R
+                s/[:space:]-R/ -Wl,-R/
+                # If the above replacement succeeded, next!
+                t
+                # Augment any remaining -L with a matching -Wl,-R
+                s/-L[:space:]*([^[:space:]]+)/& -Wl,-R\1/
+            }
+        ' $f || echo "Failed to fix $f" >> $tf
+        logcmd $DIFF -u $f{.orig,}
+    done < <($FD -t f -e pc -p "${LIBDIRS[$arch]}/pkgconfig/[^/]+\\.pc\$" $DESTDIR)
+    if [ -s "$tf" ]; then
+        $CAT $tf | pipelog
+        logerr "Problem fixing pkg-config files"
+    fi
 }
 
 make_install_i386() {
@@ -3691,7 +3715,7 @@ check_rtime() {
         -f $TMPDIR/rtime.files
 
     if [ -s "$TMPDIR/rtime.err" ]; then
-        $CAT $TMPDIR/rtime.err | $TEE -a $LOGFILE
+        $CAT $TMPDIR/rtime.err | pipelog
         logerr "ELF runtime problems detected"
     fi
 }
@@ -3709,7 +3733,7 @@ check_ssp() {
     done < <(rtime_objects)
     wait
     if [ -s "$TMPDIR/rtime.ssp" ]; then
-        $CAT $TMPDIR/rtime.ssp | $TEE -a $LOGFILE
+        $CAT $TMPDIR/rtime.ssp | pipelog
         logerr "Found object(s) without SSP"
     fi
 }
@@ -3748,7 +3772,7 @@ check_soname() {
     done < <(rtime_objects -f)
     wait
     if [ -s "$TMPDIR/rtime.soname" ]; then
-        $CAT $TMPDIR/rtime.soname | $TEE -a $LOGFILE
+        $CAT $TMPDIR/rtime.soname | pipelog
         logerr "Found SONAME problems"
     fi
 }
@@ -3773,7 +3797,7 @@ check_bmi() {
     done < <(rtime_objects)
     wait
     if [ -s "$TMPDIR/rtime.bmi" ]; then
-        $CAT $TMPDIR/rtime.bmi | $TEE -a $LOGFILE
+        $CAT $TMPDIR/rtime.bmi | pipelog
         logerr "BMI instruction set found"
     fi
 }