Skip site navigation (1) Skip section navigation (2)

Re: Support building in a different directory on Solaris

From: Ian Lance Taylor <ian(at)airs(dot)com>
To: Bruce Momjian <pgman(at)candle(dot)pha(dot)pa(dot)us>
Cc: pgsql-patches(at)postgresql(dot)org
Subject: Re: Support building in a different directory on Solaris
Date: 2001-09-07 04:59:25
Message-ID: sipu93mw9e.fsf@daffy.airs.com (view raw or flat)
Thread:
Lists: pgsql-patches
Bruce Momjian <pgman(at)candle(dot)pha(dot)pa(dot)us> writes:

> Your patch has been added to the PostgreSQL unapplied patches list at:
> 
> 	http://candle.pha.pa.us/cgi-bin/pgpatches
> 
> I will try to apply it within the next 48 hours.

Thanks.  There was some discussion of a slightly different patch to
address this by removing the requirement for test -ef.  I've appended
a patch for that; it has not been tested as well as my previous patch.
I'm agnostic as to which one is used.

Ian

Index: configure.in
===================================================================
RCS file: /projects/cvsroot/pgsql/configure.in,v
retrieving revision 1.136
diff -u -r1.136 configure.in
--- configure.in	2001/09/06 03:23:38	1.136
+++ configure.in	2001/09/07 04:58:47
@@ -1216,25 +1216,18 @@
   AC_CHECK_PROGS(SGMLSPL, sgmlspl)
 fi
 
-# check whether 'test -ef' works
-if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then
-  test_ef_works=yes
-else
-  test_ef_works=no
-fi
-
 abs_top_srcdir=
 AC_SUBST(abs_top_srcdir)
 
-if test "$test_ef_works" = yes ; then
 # prepare build tree if outside source tree
-  if test "$srcdir" -ef . ; then : ; else
-    abs_top_srcdir=`cd $srcdir && pwd`
-    echo $ac_n "preparing build tree... $ac_c" 1>&6
-    /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "." \
-      || AC_MSG_ERROR(failed)
-    AC_MSG_RESULT(done)
-  fi
+if test "`cd $srcdir && /bin/pwd`" = "`/bin/pwd`"; then
+  :
+else
+  abs_top_srcdir=`cd $srcdir && pwd`
+  echo $ac_n "preparing build tree... $ac_c" 1>&6
+  /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "." \
+    || AC_MSG_ERROR(failed)
+  AC_MSG_RESULT(done)
 fi
 
 AC_OUTPUT(
Index: prep_buildtree
===================================================================
RCS file: /projects/cvsroot/pgsql/config/prep_buildtree,v
retrieving revision 1.3
diff -u -r1.3 prep_buildtree
--- prep_buildtree	2001/03/03 15:53:41	1.3
+++ prep_buildtree	2001/09/07 04:59:01
@@ -29,10 +29,12 @@
     fi
 done
 
-for item in `find "$sourcetree" -name Makefile -o -name GNUmakefile`; do
+for item in `find "$sourcetree" -name Makefile -print -o -name GNUmakefile -print`; do
     subdir=`expr "$item" : "$sourcetree\(.*\)"`
     if test ! -f "${item}.in"; then
-        ln -fs "$item" "$buildtree/$subdir" || exit 1
+        if cmp "$item" "$buildtree/subdir" >/dev/null 2>&1; then : ; else
+            ln -fs "$item" "$buildtree/$subdir" || exit 1
+        fi
     fi
 done
 

In response to

Responses

pgsql-patches by date

Next:From: Barry LindDate: 2001-09-07 05:06:28
Subject: Re: JDBC patch procedures (Re: [PATCHES] Patch for jdbc2 ResultSet.java)
Previous:From: Bruce MomjianDate: 2001-09-07 04:41:04
Subject: Re: [GENERAL] Re: copy to/from stdout using libpgtcl

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group