subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1595955 - /subversion/trunk/Makefile.in
Date Mon, 19 May 2014 16:47:29 GMT
Author: julianfoad
Date: Mon May 19 16:47:28 2014
New Revision: 1595955

URL: http://svn.apache.org/r1595955
Log:
* Makefile.in
  (TEST_SHLIB_VAR_JAVAHL, TEST_SHLIB_VAR_SWIG_PY, TEST_SHLIB_VAR_SWIG_RB):
    Add more explanation, from Ben Reser, about why we set DYLD_LIBRARY_PATH;
    and move these sections adjacent to each other for clarity.

Modified:
    subversion/trunk/Makefile.in

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1595955&r1=1595954&r2=1595955&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Mon May 19 16:47:28 2014
@@ -212,7 +212,10 @@ COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
 COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS)
 
-# export an env variable so that the tests can run without being installed
+# On Mac OS X, export an env variable so that the tests can run without
+# being installed. OS X needs the DYLD_LIBRARY_PATH env variable set in
+# order to find the libraries to link against, because we can't effectively
+# use rpath due to way rpath is implemented in the Mach executable format.
 TEST_SHLIB_VAR_JAVAHL=\
   if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
     for d in $(abs_builddir)/subversion/libsvn_*; do \
@@ -224,6 +227,28 @@ TEST_SHLIB_VAR_JAVAHL=\
     done; \
     export @SVN_APR_SHLIB_PATH_VAR@; \
   fi;
+TEST_SHLIB_VAR_SWIG_PY=\
+  if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
+    for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \
+      if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
+        @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+      else \
+        @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+      fi; \
+    done; \
+    export @SVN_APR_SHLIB_PATH_VAR@; \
+  fi;
+TEST_SHLIB_VAR_SWIG_RB=\
+  if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
+    for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \
+      if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
+        @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+      else \
+        @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+      fi; \
+    done; \
+    export @SVN_APR_SHLIB_PATH_VAR@; \
+  fi;
 
 # special compilation for files destined for cxxhl
 COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) -o $@ -c
@@ -314,19 +339,6 @@ INSTALL_EXTRA_SWIG_PY=\
     compileall.compile_dir("$(DESTDIR)$(swig_pydir_extra)", 1, \
     "$(swig_pydir_extra)");'
 
-# export an env variable so that the tests can run without being installed
-TEST_SHLIB_VAR_SWIG_PY=\
-  if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
-    for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \
-      if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
-        @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
-      else \
-        @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
-      fi; \
-    done; \
-    export @SVN_APR_SHLIB_PATH_VAR@; \
-  fi;
-
 # The path to generated and complementary source files for the SWIG
 # bindings.
 SWIG_PL_DIR = $(abs_builddir)/subversion/bindings/swig/perl
@@ -357,19 +369,6 @@ INSTALL_EXTRA_SWIG_RB=\
     $(INSTALL_DATA) "$$i" $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
   done
 
-# export an env variable so that the tests can run without being installed
-TEST_SHLIB_VAR_SWIG_RB=\
-  if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
-    for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \
-      if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
-        @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
-      else \
-        @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
-      fi; \
-    done; \
-    export @SVN_APR_SHLIB_PATH_VAR@; \
-  fi;
-
 APXS = @APXS@
 
 PYTHON = @PYTHON@



Mime
View raw message