Ticket #27618: subversion_svn.diff

File subversion_svn.diff, 7.0 KB (added by michaelld (Michael Dickens), 14 years ago)

"svn diff" in 'subversion' dports directory; patches to keep subversion from including and linking to install in ${prefix}

  • files/patch-configure.diff

     
     1--- configure.orig      2010-12-08 22:33:09.000000000 -0500
     2+++ configure   2010-12-08 22:34:14.000000000 -0500
     3@@ -4753,7 +4753,7 @@
     4     as_fn_error "apr-config --cflags failed" "$LINENO" 5
     5   fi
     6 
     7-  LDFLAGS="$LDFLAGS `$apr_config --ldflags`"
     8+  SVN_APR_LIBS="`$apr_config --ldflags`"
     9   if test $? -ne 0; then
     10     as_fn_error "apr-config --ldflags failed" "$LINENO" 5
     11   fi
     12@@ -4768,7 +4768,7 @@
     13     as_fn_error "apr-config --prefix failed" "$LINENO" 5
     14   fi
     15 
     16-      SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
     17+  SVN_APR_LIBS="$SVN_APR_LIBS `$apr_config --link-libtool --libs`"
     18   if test $? -ne 0; then
     19     as_fn_error "apr-config --link-libtool --libs failed" "$LINENO" 5
     20   fi
     21@@ -5090,7 +5090,7 @@
     22   fi
     23 
     24 
     25-  LDFLAGS="$LDFLAGS `$apu_config --ldflags`"
     26+  SVN_APRUTIL_LIBS="`$apu_config --ldflags`"
     27   if test $? -ne 0; then
     28     as_fn_error "apu-config --ldflags failed" "$LINENO" 5
     29   fi
     30@@ -5105,7 +5105,7 @@
     31     as_fn_error "apu-config --prefix failed" "$LINENO" 5
     32   fi
     33 
     34-      SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
     35+  SVN_APRUTIL_LIBS="$SVN_APRUTIL_LIBS `$apu_config --link-libtool --libs`"
     36   if test $? -ne 0; then
     37     as_fn_error "apu-config --link-libtool --libs failed" "$LINENO" 5
     38   fi
     39@@ -6171,8 +6171,7 @@
     40     if test -e "$serf_prefix/lib/libserf-0.la"; then
     41       SVN_SERF_LIBS="$serf_prefix/lib/libserf-0.la"
     42     else
     43-      SVN_SERF_LIBS="-lserf-0"
     44-      LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
     45+      SVN_SERF_LIBS="-L$serf_prefix/lib -lserf-0"
     46     fi
     47     SVN_SERF_EXPORT_LIBS="-L$serf_prefix/lib -lserf-0"
     48   elif test $serf_found = "reconfig"; then
     49@@ -21482,10 +21481,10 @@
     50           SVN_DB_INCLUDES="$SVN_DB_INCLUDES -I$i"
     51         done
     52         SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
     53+        SVN_DB_LIBS=""
     54         for l in `echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`; do
     55-          LDFLAGS="$LDFLAGS -L$l"
     56+          SVN_DB_LIBS="$SVN_DB_LIBS -L$l"
     57         done
     58-        SVN_DB_LIBS=""
     59         for l in `echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`; do
     60           SVN_DB_LIBS="$SVN_DB_LIBS -l$l"
     61         done
     62@@ -21806,7 +21805,7 @@
     63     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for availability of Cyrus SASL v2" >&5
     64 $as_echo_n "checking for availability of Cyrus SASL v2... " >&6; }
     65     if test "$svn_lib_sasl" = "yes"; then
     66-      SVN_SASL_LIBS="-lsasl2"
     67+      SVN_SASL_LIBS="-L${with_sasl}/lib -lsasl2"
     68       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     69 $as_echo "yes" >&6; }
     70     else
     71@@ -21818,9 +21817,9 @@
     72       fi
     73 
     74       SVN_SASL_INCLUDES=""
     75-      LDFLAGS="$saved_LDFLAGS"
     76     fi
     77 
     78+    LDFLAGS="$saved_LDFLAGS"
     79     CPPFLAGS="$saved_CPPFLAGS"
     80   fi
     81 
     82@@ -23205,10 +23204,10 @@
     83   if test "$zlib_found" = "yes"; then
     84     SVN_ZLIB_PREFIX="$zlib_prefix"
     85     SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
     86-    LDFLAGS="$LDFLAGS -L$zlib_prefix/lib"
     87+    SVN_ZLIB_LIBS="-L$zlib_prefix/lib"
     88   fi
     89 
     90-  SVN_ZLIB_LIBS="-lz"
     91+  SVN_ZLIB_LIBS="$SVN_ZLIB_LIBS -lz"
     92 
     93 
     94 

  • files/patch-Makefile.in.diff

     
    1 --- Makefile.in.orig    Sun Aug 17 19:45:25 2003
    2 +++ Makefile.in Sun Aug 17 19:45:54 2003
    3 @@ -204,7 +204,7 @@
     1--- Makefile.in.orig    2010-11-17 09:47:23.000000000 -0500
     2+++ Makefile.in 2010-12-08 22:49:00.000000000 -0500
     3@@ -103,8 +103,8 @@
     4 
     5 SHELL = @SHELL@
     6 LIBTOOL = @SVN_LIBTOOL@
     7-LTFLAGS = --tag=CC --silent
     8-LTCXXFLAGS = --tag=CXX --silent
     9+LTFLAGS = --tag=CC
     10+LTCXXFLAGS = --tag=CXX
     11 LT_LDFLAGS = @LT_LDFLAGS@
     12 LT_NO_UNDEFINED = @LT_NO_UNDEFINED@
     13 LT_CXX_LIBADD = @LT_CXX_LIBADD@
     14@@ -184,21 +184,21 @@
     15 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
     16 COMPILE_JAVAHL_JAVAH = $(JAVAH)
     17 
     18-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
     19-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
     20+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
     21+LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
     22 
     23 # special link rule for mod_dav_svn
     24-LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
     25+LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -avoid-version -module $(APACHE_LDFLAGS)
     26 
     27 # Compilation of SWIG-generated C source code
     28 COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
     29 COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@
     30 
     31 # these commands link the wrapper objects into an extension library/module
     32-LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module
     33-LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module
     34+LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -avoid-version -module
     35+LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -avoid-version -module
     36 
     37-LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir)
     38+LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD)
     39 
     40 INSTALL = @INSTALL@
     41 INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)
     42@@ -305,7 +305,7 @@
    443 clean: external-clean local-clean
    544 distclean: external-distclean local-distclean
    645 extraclean: external-extraclean local-extraclean

  • Portfile

     
    3030test.target             check
    3131test.env                CLEANUP=true
    3232
    33 patchfiles              patch-Makefile.in.diff
     33patchfiles              patch-Makefile.in.diff \
     34                        patch-configure.diff
    3435
    3536configure.args          --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
    3637                        --with-neon=${prefix} --with-apr=${prefix}/bin/apr-1-config \
    … …  
    3940                        --disable-neon-version-check --with-serf=${prefix} \
    4041                        --with-sasl=${prefix}
    4142
     43# configure does not recognize this option
     44configure.universal_args-delete --disable-dependency-tracking
     45
     46# Make sure to not use any already installed headers and libraries;
     47# these are set in CPATH and LIBRARY_PATH anyway. 
     48configure.cppflags-delete -I${prefix}/include
     49configure.ldflags-delete  -L${prefix}/lib
     50
    4251use_parallel_build      yes
    4352build.target            all
    4453