Fri Dec 10 23:57:47 PST 2004
- Previous message: [Slony1-commit] By cbbrowne: Fix up formatting of inclusions in documentation set
- Next message: [Slony1-commit] By darcyb: Clean up maintainer-clean to remove the generated yacc/lex
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message: ----------- Cleanup linking not done messages when compiling on FreeBSD 5 and 6 Modified Files: -------------- slony1-engine: configure (r1.33 -> r1.34) Makefile.global.in (r1.18 -> r1.19) slony1-engine/config: acx_pthread.m4 (r1.3 -> r1.4) slony1-engine/src/slon: Makefile (r1.23 -> r1.24) -------------- next part -------------- Index: Makefile.global.in =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v retrieving revision 1.18 retrieving revision 1.19 diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.18 -r1.19 --- Makefile.global.in +++ Makefile.global.in @@ -34,6 +34,7 @@ #build tool flags CFLAGS= @CFLAGS@ PTHREAD_CFLAGS= @PTHREAD_CFLAGS@ +PTHREAD_LIBS= @PTHREAD_LIBS@ YFLAGS= @YFLAGS@ FLEXFLAGS= @LEXFLAGS@ $(LFLAGS) @@ -52,7 +53,7 @@ subdir=$(slony_subdir) -override CPPFLAGS := -I$(top_builddir) -I${pgincludedir} -I${pgincludeserverdir} $(CPPFLAGS) +override CPPFLAGS := -I${pgincludedir} -I${pgincludeserverdir} $(CPPFLAGS) LDFLAGS = -L${pglibdir} -L${pgpkglibdir} -lpq ifeq ($(GCC), yes) @@ -81,5 +82,3 @@ ifeq ($(enable_rpath), yes) LDFLAGS += $(rpath) endif - - Index: configure =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v retrieving revision 1.33 retrieving revision 1.34 diff -Lconfigure -Lconfigure -u -w -r1.33 -r1.34 --- configure +++ configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for postgresql-slony1-engine HEAD_20041207. +# Generated by GNU Autoconf 2.53 for postgresql-slony1-engine HEAD_20041210. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -254,8 +254,8 @@ # Identity of this package. PACKAGE_NAME='postgresql-slony1-engine' PACKAGE_TARNAME='postgresql-slony1-engine' -PACKAGE_VERSION='HEAD_20041207' -PACKAGE_STRING='postgresql-slony1-engine HEAD_20041207' +PACKAGE_VERSION='HEAD_20041210' +PACKAGE_STRING='postgresql-slony1-engine HEAD_20041210' PACKAGE_BUGREPORT='' ac_unique_file="src" @@ -764,7 +764,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures postgresql-slony1-engine HEAD_20041207 to adapt to many kinds of systems. +\`configure' configures postgresql-slony1-engine HEAD_20041210 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -825,7 +825,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20041207:";; + short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20041210:";; esac cat <<\_ACEOF @@ -917,7 +917,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -postgresql-slony1-engine configure HEAD_20041207 +postgresql-slony1-engine configure HEAD_20041210 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -932,7 +932,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by postgresql-slony1-engine $as_me HEAD_20041207, which was +It was created by postgresql-slony1-engine $as_me HEAD_20041210, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -2571,7 +2571,7 @@ # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -acx_pthread_flags="pthreads none -Kthread -lpthread -kthread lthread -pthread -lpthreads -pthread -mthreads pthread --thread-safe -mt pthread-config" +acx_pthread_flags="pthreads none -Kthread -lpthread -kthread lthread pthread -pthread -mthreads pthread --thread-safe -mt pthread-config" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: @@ -2580,7 +2580,7 @@ # none: in case threads are in libc; should be tried before -Kthread and # other compiler flags to prevent continual compiler warnings # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -lpthread: FreeBSD prefered threads (5.x) +# -lpthreads: FreeBSD prefered threads (5.x) # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) # -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) @@ -2620,7 +2620,7 @@ -*) echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6 - PTHREAD_CFLAGS="$flag" +# PTHREAD_CFLAGS="$flag" ;; pthread-config) @@ -2844,8 +2844,15 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6 flag=no case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + *-aix* | *-freebsd*) + flag="-D_THREAD_SAFE" + ;; + *solaris*) + flag="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT" + ;; + *-osf* | *-hpux*) + flag="-D_REENTRANT" + ;; esac echo "$as_me:$LINENO: result: ${flag}" >&5 echo "${ECHO_T}${flag}" >&6 @@ -6336,7 +6343,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by postgresql-slony1-engine $as_me HEAD_20041207, which was +This file was extended by postgresql-slony1-engine $as_me HEAD_20041210, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6395,7 +6402,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -postgresql-slony1-engine config.status HEAD_20041207 +postgresql-slony1-engine config.status HEAD_20041210 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Index: acx_pthread.m4 =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_pthread.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -Lconfig/acx_pthread.m4 -Lconfig/acx_pthread.m4 -u -w -r1.3 -r1.4 --- config/acx_pthread.m4 +++ config/acx_pthread.m4 @@ -1,4 +1,4 @@ -dnl Available from the GNU Autoconf Macro Archive at: +??dnl Available from the GNU Autoconf Macro Archive at: dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_pthread.html dnl AC_DEFUN([ACX_PTHREAD], [ @@ -40,7 +40,7 @@ # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -acx_pthread_flags="pthreads none -Kthread -lpthread -kthread lthread -pthread -lpthreads -pthread -mthreads pthread --thread-safe -mt pthread-config" +acx_pthread_flags="pthreads none -Kthread -lpthread -kthread lthread pthread -pthread -mthreads pthread --thread-safe -mt pthread-config" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: @@ -49,7 +49,7 @@ # none: in case threads are in libc; should be tried before -Kthread and # other compiler flags to prevent continual compiler warnings # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -lpthread: FreeBSD prefered threads (5.x) +# -lpthreads: FreeBSD prefered threads (5.x) # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) # -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) @@ -87,7 +87,7 @@ -*) AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" +# PTHREAD_CFLAGS="$flag" ;; pthread-config) @@ -167,8 +167,15 @@ AC_MSG_CHECKING([if more special flags are required for pthreads]) flag=no case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + *-aix* | *-freebsd*) + flag="-D_THREAD_SAFE" + ;; + *solaris*) + flag="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT" + ;; + *-osf* | *-hpux*) + flag="-D_REENTRANT" + ;; esac AC_MSG_RESULT(${flag}) if test "x$flag" != xno; then Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.23 -r1.24 --- src/slon/Makefile +++ src/slon/Makefile @@ -13,12 +13,8 @@ CC = $(PTHREAD_CC) -ifeq ($(PORTNAME), solaris) - CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -endif - override CFLAGS += $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(pgincludedir) -override LDFLAGS += $(PTHREAD_CFLAGS) $(rpath) $(PTHREAD_LIBS) -L$(pglibdir) -lpq +override LDFLAGS += $(rpath) $(PTHREAD_LIBS) -L$(pglibdir) -lpq PROG = slon @@ -34,6 +30,7 @@ remote_worker.o \ sync_thread.o \ cleanup_thread.o \ + stats_thread.o \ scheduler.o \ dbutils.o \ conf-file.o \ @@ -49,7 +46,7 @@ all: $(ALL) $(PROG): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(PROG) + $(CC) $(CFLAGS) $(OBJS) $(PTHREAD_LDFLAGS) $(LDFLAGS) -o $(PROG) cleanup_thread.o: cleanup_thread.c slon.h dbutils.o: dbutils.c slon.h
- Previous message: [Slony1-commit] By cbbrowne: Fix up formatting of inclusions in documentation set
- Next message: [Slony1-commit] By darcyb: Clean up maintainer-clean to remove the generated yacc/lex
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list