From: Pietro Cerutti <gahr@gahr.ch>
Date: Thu, 2 Aug 2018 12:08:39 +0000 (+0000)
Subject: Update autosetup to 0.6.9
X-Git-Tag: 2019-10-25~718
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56bb0bb8666590eb44c1f3cb2b573a53baf2a939;p=neomutt

Update autosetup to 0.6.9
---

diff --git a/autosetup/README.autosetup b/autosetup/README.autosetup
index 2e077b81b..a6215e80a 100644
--- a/autosetup/README.autosetup
+++ b/autosetup/README.autosetup
@@ -1,4 +1,4 @@
-README.autosetup created by autosetup v0.6.8
+README.autosetup created by autosetup v0.6.9
 
 This is the autosetup directory for a local install of autosetup.
 It contains autosetup, support files and loadable modules.
diff --git a/autosetup/autosetup b/autosetup/autosetup
index 63441bb8b..a4480fd3b 100755
--- a/autosetup/autosetup
+++ b/autosetup/autosetup
@@ -5,7 +5,7 @@
 # \
 dir=`dirname "$0"`; exec "`$dir/autosetup-find-tclsh`" "$0" "$@"
 
-set autosetup(version) 0.6.8
+set autosetup(version) 0.6.9
 
 # Can be set to 1 to debug early-init problems
 set autosetup(debug) [expr {"--debug" in $argv}]
diff --git a/autosetup/cc-shared.tcl b/autosetup/cc-shared.tcl
index a3edfad0d..0d6d52218 100644
--- a/autosetup/cc-shared.tcl
+++ b/autosetup/cc-shared.tcl
@@ -9,11 +9,13 @@
 ## SH_CFLAGS         Flags to use compiling sources destined for a shared library
 ## SH_LDFLAGS        Flags to use linking (creating) a shared library
 ## SH_SOPREFIX       Prefix to use to set the soname when creating a shared library
+## SH_SOFULLPATH     Set to 1 if the shared library soname should include the full install path
 ## SH_SOEXT          Extension for shared libs
 ## SH_SOEXTVER       Format for versioned shared libs - %s = version
 ## SHOBJ_CFLAGS      Flags to use compiling sources destined for a shared object
 ## SHOBJ_LDFLAGS     Flags to use linking a shared object, undefined symbols allowed
 ## SHOBJ_LDFLAGS_R   - as above, but all symbols must be resolved
+## SH_LINKRPATH      Format for setting the rpath when linking an executable, %s = path
 ## SH_LINKFLAGS      Flags to use linking an executable which will load shared objects
 ## LD_LIBRARY_PATH   Environment variable which specifies path to shared libraries
 ## STRIPLIBFLAGS     Arguments to strip a dynamic library
@@ -21,11 +23,12 @@
 module-options {}
 
 # Defaults: gcc on unix
-define SHOBJ_CFLAGS -fpic
+define SHOBJ_CFLAGS -fPIC
 define SHOBJ_LDFLAGS -shared
-define SH_CFLAGS -fpic
+define SH_CFLAGS -fPIC
 define SH_LDFLAGS -shared
 define SH_LINKFLAGS -rdynamic
+define SH_LINKRPATH "-Wl,-rpath -Wl,%s"
 define SH_SOEXT .so
 define SH_SOEXTVER .so.%s
 define SH_SOPREFIX -Wl,-soname,
@@ -46,6 +49,7 @@ switch -glob -- [get-define host] {
 		define SH_SOEXT .dylib
 		define SH_SOEXTVER .%s.dylib
 		define SH_SOPREFIX -Wl,-install_name,
+		define SH_SOFULLPATH
 		define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
 		define STRIPLIBFLAGS -x
 	}
@@ -54,6 +58,7 @@ switch -glob -- [get-define host] {
 		define SHOBJ_LDFLAGS -shared
 		define SH_CFLAGS ""
 		define SH_LDFLAGS -shared
+		define SH_LINKRPATH ""
 		define SH_LINKFLAGS ""
 		define SH_SOEXT .dll
 		define SH_SOEXTVER .dll
@@ -70,10 +75,6 @@ switch -glob -- [get-define host] {
 			define SH_CFLAGS -KPIC
 			define SH_LINKFLAGS -Wl,-export-dynamic
 			define SH_SOPREFIX -Wl,-h,
-		} else {
-			# sparc has a very small GOT table limit, so use -fPIC
-			define SH_CFLAGS -fPIC
-			define SHOBJ_CFLAGS -fPIC
 		}
 	}
 	*-*-solaris* {
@@ -105,11 +106,6 @@ switch -glob -- [get-define host] {
 		define SH_SOPREFIX ""
 		define LD_LIBRARY_PATH LIBRARY_PATH
 	}
-	microblaze* {
-		# Microblaze generally needs -fPIC rather than -fpic
-		define SHOBJ_CFLAGS -fPIC
-		define SH_CFLAGS -fPIC
-	}
 }
 
 if {![is-defined SHOBJ_LDFLAGS_R]} {