curl/git: ensure curl is built with rpath entries so that git find ne…

…cessary sub-dependencies when linking with libcurl.

README.md

@@ -18,12 +18,14 @@ NOTE: Unlike `didbsng` - sgug-rse _must not_ use a "personal .rpmmacros" file -
 
 (1) Download the artifacts for the latest version from the github releases tab (assuming they aren't too big).
 
-You'll find three archives:
+You'll find three main archives - and there might be "fix" archives too that need to be extracted:
 
 ```
 sgug-rse-selfhoster-0.0.1alpha.tar.gz
 sgug-rse-srpms-0.0.1alpha.tar.gz
 sgug-rse-rpms-0.0.1alpha.tar.gz
+
+sgug-rse-blahfix-0.0.Xalpha.tar.gz
 ```
 
 (2) Extract the selfhoster archive under /usr as root (important, sgug-rse _installation_ files are root owned and managed):
@@ -44,12 +46,16 @@ mkdir -p ~/rpmbuild/SRPMS
 mkdir -p ~/rpmbuild/RPMS
 ```
 
-(4) As your user extract the SRPMs and RPMs in the right place:
+(4) As your user extract the SRPMs and RPMs in the right place.
+
+This should include any fixes:
 
 ```
 cd ~/rpmbuild
 gunzip -dc /path/to/sgug-rse-srpms-0.0.1alpha.tar.gz | tar xf -
 gunzip -dc /path/to/sgug-rse-rpms-0.0.1alpha.tar.gz | tar xf -
+# Optional
+gunzip -dc /path/to/sgug-rse-blahfix-0.0.Xalpha.tar.gz | tar xf -
 ```
 
 (5) You'll need to clone this repo (sgug-rse) -

packages/curl/SPECS/curl.spec

@@ -219,6 +219,8 @@ export SHELL="%{_bindir}/sh"
 export SHELL_PATH="$SHELL"
 export CONFIG_SHELL="$SHELL"
 export PERL="%{_bindir}/perl"
+export CFLAGS="-R%{_libdir} $CFLAGS"
+export LDFLAGS="-rpath %{_libdir} $LDFLAGS"
 mkdir build-{full,minimal}
 export common_configure_opts=" \
     --cache-file=../config.cache \
@@ -270,9 +272,9 @@ export common_configure_opts=" \
 )
 
 # avoid using rpath
-sed -e 's/^runpath_var=.*/runpath_var=/' \
-    -e 's/^hardcode_libdir_flag_spec=".*"$/hardcode_libdir_flag_spec=""/' \
-    -i build-{full,minimal}/libtool
+#sed -e 's/^runpath_var=.*/runpath_var=/' \
+#    -e 's/^hardcode_libdir_flag_spec=".*"$/hardcode_libdir_flag_spec=""/' \
+#    -i build-{full,minimal}/libtool
 
 make %{?_smp_mflags} V=1 -C build-minimal
 make %{?_smp_mflags} V=1 -C build-full
@@ -282,6 +284,8 @@ export SHELL="%{_bindir}/sh"
 export SHELL_PATH="$SHELL"
 export CONFIG_SHELL="$SHELL"
 export PERL="%{_bindir}/perl"
+export CFLAGS="-R%{_libdir} $CFLAGS"
+export LDFLAGS="-rpath %{_libdir} $LDFLAGS"
 # we have to override LD_LIBRARY_PATH because we eliminated rpath
 LD_LIBRARYN32_PATH="$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARYN32_PATH"
 export LD_LIBRARYN32_PATH
@@ -302,6 +306,8 @@ export SHELL="%{_bindir}/sh"
 export SHELL_PATH="$SHELL"
 export CONFIG_SHELL="$SHELL"
 export PERL="%{_bindir}/perl"
+export CFLAGS="-R%{_libdir} $CFLAGS"
+export LDFLAGS="-rpath %{_libdir} $LDFLAGS"
 # install and rename the library that will be packaged as libcurl-minimal
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C build-minimal/lib
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.{la,so}