Make the relocatable flag do something

Author: zanieb

cpython-unix/build-cpython.sh

@@ -59,9 +59,11 @@ cat Makefile.extra
 pushd Python-${PYTHON_VERSION}
 
 
-# add `--enable-relocatable`
 if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_15}" ]; then
-    patch -p1 -i ${ROOT}/patch-reloctable-flag.patch
+    # add `--enable-relocatable`
+    patch -p1 -i ${ROOT}/patch-relocatable-flag.patch
+    # add native support for rpath
+    patch -p1 -i ${ROOT}/patch-relocatable-link.patch
 fi
 
 # configure doesn't support cross-compiling on Apple. Teach it.
@@ -163,10 +165,12 @@ fi
 
 # The default build rule for the macOS dylib doesn't pick up libraries
 # from modules / makesetup. So patch it accordingly.
-if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
-    patch -p1 -i ${ROOT}/patch-macos-link-extension-modules-13.patch
-else
-    patch -p1 -i ${ROOT}/patch-macos-link-extension-modules.patch
+if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_14}" ]; then
+    if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
+        patch -p1 -i ${ROOT}/patch-macos-link-extension-modules-13.patch
+    else
+        patch -p1 -i ${ROOT}/patch-macos-link-extension-modules.patch
+    fi
 fi
 
 # Also on macOS, the `python` executable is linked against libraries defined by statically
@@ -687,7 +691,8 @@ fi
 # If we're building a shared library hack some binaries so rpath is set.
 # This ensures we can run the binary in any location without
 # LD_LIBRARY_PATH pointing to the directory containing libpython.
-if [ "${PYBUILD_SHARED}" = "1" ]; then
+# In 3.15+, we've upstreamed this behavior
+if [[ "${PYBUILD_SHARED}" = "1"  && -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_14}" ]]; then
     if [[ "${PYBUILD_PLATFORM}" = macos* ]]; then
         # There's only 1 dylib produced on macOS and it has the binary suffix.
         LIBPYTHON_SHARED_LIBRARY_BASENAME=libpython${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}.dylib

cpython-unix/patch-relocatable-link.patch

@@ -0,0 +1,78 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 6c9cba59e27..39fc2e911d0 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1028,7 +1028,12 @@ libpython3.so:	libpython$(LDVERSION).so
+ 	$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
+ 
+ libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
+-	 $(CC) -dynamiclib $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
++	if [ "$(RELOCATABLE)" = "yes" ]; then \
++		install_name="@executable_path/../lib/libpython$(LDVERSION).dylib"; \
++	else \
++		install_name="$(prefix)/lib/libpython$(LDVERSION).dylib"; \
++	fi; \
++	$(CC) -dynamiclib $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$$install_name -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM);
+ 
+ 
+ libpython$(VERSION).sl: $(LIBRARY_OBJS)
+diff --git a/configure b/configure
+index 38f2d4dfbf2..153add6ac12 100755
+--- a/configure
++++ b/configure
+@@ -13749,7 +13749,13 @@ then
+ 	    LINKFORSHARED="-Wl,-E -Wl,+s";;
+ #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
+ 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
+-	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
++	Linux*|GNU*)
++		LINKFORSHARED="-Xlinker -export-dynamic"
++		# Add rpath for relocatable builds
++		if test "x$enable_relocatable" = xyes; then
++			LINKFORSHARED="$LINKFORSHARED -Wl,-rpath=\$ORIGIN/../lib"
++		fi
++		;;
+ 	# -u libsys_s pulls in all symbols in libsys
+ 	Darwin/*|iOS/*)
+ 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+@@ -13774,6 +13780,10 @@ printf "%s\n" "#define THREAD_STACK_SIZE 0x$stack_size" >>confdefs.h
+ 			if test "$enable_framework"; then
+ 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ 			fi
++			# Add rpath for relocatable builds
++			if test "x$enable_relocatable" = xyes; then
++				LINKFORSHARED="$LINKFORSHARED -Wl,-rpath,@executable_path/../lib"
++			fi
+ 			LINKFORSHARED="$LINKFORSHARED"
+ 		elif test $ac_sys_system = "iOS"; then
+ 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'
+diff --git a/configure.ac b/configure.ac
+index b1c859071f4..a40d279ebab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3613,7 +3613,13 @@ then
+ 	    LINKFORSHARED="-Wl,-E -Wl,+s";;
+ #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
+ 	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
+-	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
++	Linux*|GNU*)
++		LINKFORSHARED="-Xlinker -export-dynamic"
++		# Add rpath for relocatable builds
++		if test "x$enable_relocatable" = xyes; then
++			LINKFORSHARED="$LINKFORSHARED -Wl,-rpath=\$ORIGIN/../lib"
++		fi
++		;;
+ 	# -u libsys_s pulls in all symbols in libsys
+ 	Darwin/*|iOS/*)
+ 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+@@ -3638,6 +3644,10 @@ then
+ 			if test "$enable_framework"; then
+ 				LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+ 			fi
++			# Add rpath for relocatable builds
++			if test "x$enable_relocatable" = xyes; then
++				LINKFORSHARED="$LINKFORSHARED -Wl,-rpath,@executable_path/../lib"
++			fi
+ 			LINKFORSHARED="$LINKFORSHARED"
+ 		elif test $ac_sys_system = "iOS"; then
+ 			LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)'