[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Inherit pthreads flags from APR configure.

From: Branko Čibej <branko.cibej_at_hermes.si>
Date: 2000-09-11 17:29:59 CEST

With a small patch to APR's configury, SVN can use the pthreads flags
found by APR. IMHO anything's better than explicitly defining
'CFLAGS = -pthread', which BTW doesn't work on Solaris ...

    Brane

-- 
Branko Čibej                 <branko.cibej@hermes.si>
HERMES SoftLab, Litijska 51, 1000 Ljubljana, Slovenia
voice: (+386 1) 586 53 49     fax: (+386 1) 586 52 70

2000-09-11 Branko Cibej <branko.cibej@hermes.si>

        * APRVARS.in: Define PTHREAD_CFLAGS.
        * configure.in: Substitute PTHREAD_FLAGS and ac_cv_pthreads_cflags
        used by PTHREAD_CFLAGS in APRVARS.in.

        
Index: apr/APRVARS.in
===================================================================
RCS file: /home/cvspublic/apache-2.0/src/lib/apr/APRVARS.in,v
retrieving revision 1.3
diff -c -p -r1.3 APRVARS.in
*** apr/APRVARS.in 2000/09/10 22:07:15 1.3
--- apr/APRVARS.in 2000/09/11 15:14:01
***************
*** 1 ****
--- 1,2 ----
  EXTRA_LIBS="$EXTRA_LIBS @LIBS@"
+ PTHREAD_CFLAGS="@ac_cv_pthreads_cflags@ @PTHREAD_FLAGS@"
Index: apr/configure.in
===================================================================
RCS file: /home/cvspublic/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.147
diff -c -p -r1.147 configure.in
*** apr/configure.in 2000/09/01 00:13:33 1.147
--- apr/configure.in 2000/09/11 15:14:01
*************** AC_SUBST(OSDIR)
*** 704,709 ****
--- 704,711 ----
  AC_SUBST(DEFAULT_OSDIR)
  AC_SUBST(LIBPREFIX)
  AC_SUBST(EXEEXT)
+ AC_SUBST(PTHREAD_FLAGS)
+ AC_SUBST(ac_cv_pthreads_cflags)
  
  echo "Construct Makefiles and header files."
  MAKEFILE1="Makefile lib/Makefile strings/Makefile passwd/Makefile tables/Makefile"

2000-09-11 Branko Cibej <branko.cibej@hermes.si>

    Use pthread flags found by APR configure:

        * configure.in: Source apr/APRVARS and add PTHREAD_CFLAGS to CFLAGS.
        * Makefile.am: (multiple files) Remove all instances of explicit
        "CFLAGS = -pthread".

Index: configure.in
===================================================================
RCS file: /cvs/subversion/configure.in,v
retrieving revision 1.25
diff -c -p -r1.25 configure.in
*** configure.in 2000/09/09 16:19:38 1.25
--- configure.in 2000/09/11 15:13:55
*************** if test "$enable_debugging" = "yes"; the
*** 133,138 ****
--- 133,143 ----
    changequote([,])
  fi
  
+ dnl Get compiler flags for pthreads from apr -------------------
+
+ . apr/APRVARS
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
  
  dnl Pass some config data ----------------------------
  
Index: subversion/libsvn_delta/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_delta/tests/Makefile.am,v
retrieving revision 1.3
diff -c -p -r1.3 Makefile.am
*** subversion/libsvn_delta/tests/Makefile.am 2000/09/11 09:21:49 1.3
--- subversion/libsvn_delta/tests/Makefile.am 2000/09/11 15:13:55
*************** noinst_PROGRAMS = deltaparse-test
*** 4,10 ****
  deltaparse_test_SOURCES = deltaparse-test.c
  
  ## Flags needed when compiling:
- CFLAGS = -pthread
  INCLUDES = -I../../include -I../../../apr/include -I../../../expat-lite
  
  ## Libraries this binary depends upon:
--- 4,9 ----
Index: subversion/libsvn_ra_dav/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_ra_dav/tests/Makefile.am,v
retrieving revision 1.4
diff -c -p -r1.4 Makefile.am
*** subversion/libsvn_ra_dav/tests/Makefile.am 2000/09/11 09:21:50 1.4
--- subversion/libsvn_ra_dav/tests/Makefile.am 2000/09/11 15:13:55
*************** noinst_PROGRAMS = ra-dav-test
*** 4,10 ****
  ra_dav_test_SOURCES = ra-dav-test.c
  
  ## Flags needed when compiling:
- CFLAGS = -pthread
  INCLUDES = -I../../include -I../../../apr/include
  
  ## Libraries this binary depends upon:
--- 4,9 ----
Index: subversion/libsvn_string/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_string/tests/Makefile.am,v
retrieving revision 1.8
diff -c -p -r1.8 Makefile.am
*** subversion/libsvn_string/tests/Makefile.am 2000/09/11 09:21:50 1.8
--- subversion/libsvn_string/tests/Makefile.am 2000/09/11 15:13:55
*************** noinst_PROGRAMS = stringtest
*** 4,10 ****
  stringtest_SOURCES = stringtest.c
  
  ## Flags needed when compiling:
- CFLAGS = -pthread
  INCLUDES = -I../../include -I../../../apr/include
  
  ## Libraries this binary depends upon:
--- 4,9 ----
Index: subversion/libsvn_subr/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_subr/tests/Makefile.am,v
retrieving revision 1.6
diff -c -p -r1.6 Makefile.am
*** subversion/libsvn_subr/tests/Makefile.am 2000/09/11 09:21:51 1.6
--- subversion/libsvn_subr/tests/Makefile.am 2000/09/11 15:13:55
*************** noinst_PROGRAMS = hashdump-test
*** 4,10 ****
  hashdump_test_SOURCES = hashdump-test.c
  
  ## Flags needed when compiling:
- CFLAGS = -pthread
  INCLUDES = -I../../include -I../../../apr/include
  
  ## Libraries this binary depends upon:
--- 4,9 ----
Index: subversion/libsvn_wc/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_wc/tests/Makefile.am,v
retrieving revision 1.7
diff -c -p -r1.7 Makefile.am
*** subversion/libsvn_wc/tests/Makefile.am 2000/09/11 09:21:51 1.7
--- subversion/libsvn_wc/tests/Makefile.am 2000/09/11 15:13:55
*************** noinst_PROGRAMS = checkout-test
*** 4,10 ****
  checkout_test_SOURCES = checkout-test.c
  
  ## Flags needed when compiling:
- CFLAGS = -pthread
  INCLUDES = -I../../include -I../../../apr/include -I../../../expat-lite
  
  ## Libraries this binary depends upon:
--- 4,9 ----
Index: subversion/tests-common/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/tests-common/Makefile.am,v
retrieving revision 1.3
diff -c -p -r1.3 Makefile.am
*** subversion/tests-common/Makefile.am 2000/09/11 09:21:52 1.3
--- subversion/tests-common/Makefile.am 2000/09/11 15:13:55
*************** lib_LTLIBRARIES = libsvn_tests_main.la
*** 4,10 ****
  libsvn_tests_main_la_SOURCES = svn_tests_main.c
  
  ## Flags needed when compiling:
- CFLAGS = -pthread
  INCLUDES = -I../../apr/include
  
  
--- 4,9 ----
Received on Sat Oct 21 14:36:08 2006

This is an archived mail posted to the Subversion Dev mailing list.