[postgis] 01/01: Revert unintended changes against upstream.
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Wed Apr 16 16:04:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch master
in repository postgis.
commit ddf0f585e58fdfc6781cdab6a2cce40f6b6079b3
Author: Markus Wanner <markus at bluegap.ch>
Date: Wed Apr 16 18:02:54 2014 +0200
Revert unintended changes against upstream.
---
doc/Makefile | 18 ++---
doc/html/image_src/Makefile | 8 +-
java/jdbc/Makefile | 2 +-
libtool | 177 ++++++++++++++++++++++----------------------
topology/test/Makefile | 2 +-
5 files changed, 102 insertions(+), 105 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile
index 1f5a4d1..673bf74 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -30,10 +30,10 @@ POSTGIS_MICRO_VERSION=2
INSTALL=/usr/bin/install -c
INSTALL_DATA=${INSTALL} -m 644
-XSLTPROC=/usr/bin/xsltproc
-XSLBASE=/usr/share/xml/docbook/stylesheet/nwalsh
-XMLLINT=/usr/bin/xmllint
-PERL=/usr/bin/perl
+XSLTPROC=/opt/local/bin/xsltproc
+XSLBASE=
+XMLLINT=/opt/local/bin/xmllint
+PERL=/opt/local/bin/perl
# To allow network access use:
#
@@ -63,10 +63,10 @@ HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
# DBLatex's dblatex script for PDF generation from DocBook
-DBLATEX=/usr/bin/dblatex
+DBLATEX=
# Imagemagick's convert utility program for generated images used in the documentation
-IMAGEMAGICK=/usr/bin/convert
+IMAGEMAGICK=/opt/local/bin/convert
# Gettext for translated documentation
MSGMERGE=msgmerge
@@ -78,9 +78,9 @@ XML2POT=xml2pot
DBTOEPUB=dbtoepub
# Directories for postgresql subdirectories
-PGSQL_DOCDIR=/usr/share/doc/postgresql-doc-9.3
-PGSQL_MANDIR=/usr/share/postgresql/9.3/man
-PGSQL_SHAREDIR=/usr/share/postgresql/9.3
+PGSQL_DOCDIR=/opt/pgsql/9.2/share/doc
+PGSQL_MANDIR=/opt/pgsql/9.2/share/man
+PGSQL_SHAREDIR=/opt/pgsql/9.2/share
# If XSLTPROC or XSLBASE were not found during configure, we cannot
# build the documentation
diff --git a/doc/html/image_src/Makefile b/doc/html/image_src/Makefile
index 5025391..1b3d271 100644
--- a/doc/html/image_src/Makefile
+++ b/doc/html/image_src/Makefile
@@ -10,11 +10,11 @@
# *
# **********************************************************************
-CC=x86_64-linux-gnu-gcc
-CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -Wmissing-prototypes
+CC=gcc
+CFLAGS=-g -O2 -Wall -Wmissing-prototypes -I/usr/local/include
-CUNIT_LDFLAGS=-Wl,-z,relro -lcunit
-CUNIT_CPPFLAGS=-D_FORTIFY_SOURCE=2 -I../../../liblwgeom
+CUNIT_LDFLAGS=
+CUNIT_CPPFLAGS= -I../../../liblwgeom
IMAGES= \
../images/de9im01.png \
diff --git a/java/jdbc/Makefile b/java/jdbc/Makefile
index dd4f5f9..9711a16 100644
--- a/java/jdbc/Makefile
+++ b/java/jdbc/Makefile
@@ -10,7 +10,7 @@
# *
# **********************************************************************
-ANT=/usr/bin/ant
+ANT=/opt/local/bin/ant
all: build
diff --git a/libtool b/libtool
index e0ff6aa..7e3ac41 100755
--- a/libtool
+++ b/libtool
@@ -1,8 +1,8 @@
-#! /bin/bash
+#! /bin/sh
# libtool - Provide generalized library-building support services.
# Generated automatically by config.status ()
-# Libtool was configured on host argodan:
+# Libtool was configured on host Butterfly.local:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -53,10 +53,10 @@ build_old_libs=yes
pic_mode=default
# Whether or not to optimize for fast installation.
-fast_install=yes
+fast_install=needless
# Shell to use when invoking shell scripts.
-SHELL="/bin/bash"
+SHELL="/bin/sh"
# An echo program that protects backslashes.
ECHO="printf %s\\n"
@@ -65,38 +65,38 @@ ECHO="printf %s\\n"
PATH_SEPARATOR=":"
# The host system.
-host_alias=x86_64-linux-gnu
-host=x86_64-pc-linux-gnu
-host_os=linux-gnu
+host_alias=
+host=x86_64-apple-darwin13.1.0
+host_os=darwin13.1.0
# The build system.
-build_alias=x86_64-linux-gnu
-build=x86_64-pc-linux-gnu
-build_os=linux-gnu
+build_alias=
+build=x86_64-apple-darwin13.1.0
+build_os=darwin13.1.0
# A sed program that does not truncate output.
-SED="/bin/sed"
+SED="/usr/bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="$SED -e 1s/^X//"
# A grep program that handles long lines.
-GREP="/bin/grep"
+GREP="/usr/bin/grep"
# An ERE matcher.
-EGREP="/bin/grep -E"
+EGREP="/usr/bin/grep -E"
# A literal string matcher.
-FGREP="/bin/grep -F"
+FGREP="/usr/bin/grep -F"
# A BSD- or MS-compatible name lister.
-NM="/usr/bin/nm -B"
+NM="/usr/bin/nm"
# Whether we need soft or hard links.
LN_S="ln -s"
# What is the maximum length of a command?
-max_cmd_len=3458764513820540925
+max_cmd_len=196608
# Object file suffix (normally "o").
objext=o
@@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop
to_tool_file_cmd=func_convert_file_noop
# An object symbol dumper.
-OBJDUMP="objdump"
+OBJDUMP="false"
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
@@ -147,7 +147,7 @@ AR="ar"
AR_FLAGS="cru"
# How to feed a file listing to the archiver.
-archiver_list_spec="@"
+archiver_list_spec=""
# A symbol stripping program.
STRIP="strip"
@@ -158,28 +158,28 @@ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib"
old_postuninstall_cmds=""
# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=no
+lock_old_archive_extraction=yes
# A C compiler.
-LTCC="x86_64-linux-gnu-gcc"
+LTCC="gcc"
# LTCC compiler flags.
-LTCFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security"
+LTCFLAGS="-g -O2"
# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BCDEGRST][BCDEGRST]*\\)[ ][ ]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p' | sed '/ __gnu_lto/d'"
# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"
+global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[BCDEGRST]* .* \\(.*\\)\$/extern char \\1;/p'"
# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'"
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'"
# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'"
+global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'"
# Specify filename containing input files for $NM.
-nm_file_list_spec="@"
+nm_file_list_spec=""
# The root where to search for dependent libraries,and in which our libraries should be installed.
lt_sysroot=
@@ -197,32 +197,32 @@ need_locks="no"
MANIFEST_TOOL=":"
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=""
+DSYMUTIL="dsymutil"
# Tool to change global to local symbols on Mac OS X.
-NMEDIT=""
+NMEDIT="nmedit"
# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=""
+LIPO="lipo"
# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=""
+OTOOL="otool"
# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=""
+OTOOL64=":"
# Old archive suffix (normally "a").
libext=a
# Shared library suffix (normally ".so").
-shrext_cmds=".so"
+shrext_cmds="\`test .\$module = .yes && echo .so || echo .dylib\`"
# The commands to extract the exported symbol list from a shared archive.
extract_expsyms_cmds=""
# Variables whose values should be saved in libtool wrapper scripts and
# restored at link time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+variables_saved_for_relink="PATH DYLD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
# Do we need the "lib" prefix for modules?
need_lib_prefix=no
@@ -231,26 +231,26 @@ need_lib_prefix=no
need_version=no
# Library versioning type.
-version_type=linux
+version_type=darwin
# Shared library runtime path variable.
-runpath_var=LD_RUN_PATH
+runpath_var=
# Shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
+shlibpath_var=DYLD_LIBRARY_PATH
# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
+shlibpath_overrides_runpath=yes
# Format of library name prefix.
libname_spec="lib\$name"
# List of archive names. First name is the real one, the rest are links.
# The last name is the one that the linker finds with -lNAME
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+library_names_spec="\${libname}\${release}\${major}\$shared_ext \${libname}\$shared_ext"
# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
+soname_spec="\${libname}\${release}\${major}\$shared_ext"
# Permission mode override for installation of shared libraries.
install_override_mode=""
@@ -262,20 +262,20 @@ postinstall_cmds=""
postuninstall_cmds=""
# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+finish_cmds=""
# As "finish_cmds", except a single script fragment to be evaled but
# not shown.
finish_eval=""
# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
+hardcode_into_libs=no
# Compile-time system search path for libraries.
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.8 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib "
+sys_lib_search_path_spec="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1 /usr/local/lib"
# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /lib32 /usr/lib32 "
+sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
# Whether dlopen is supported.
dlopen_support=unknown
@@ -287,37 +287,37 @@ dlopen_self=unknown
dlopen_self_static=unknown
# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
+old_striplib="strip -S"
+striplib="strip -x"
# The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld"
# How to create reloadable object files.
reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
# Commands used to build an old-style archive.
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
# A language specific compiler.
-CC="x86_64-linux-gnu-gcc"
+CC="gcc"
# Is the compiler the GNU compiler?
with_gcc=yes
# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
+no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
+pic_flag=" -fno-common -DPIC"
# How to pass a linker flag through the compiler.
wl="-Wl,"
# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
+link_static_flag=""
# Does compiler simultaneously support -c and -o options?
compiler_c_o="yes"
@@ -329,10 +329,10 @@ build_libtool_need_lc=no
allow_libtool_libs_with_static_runtimes=no
# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
+export_dynamic_flag_spec=""
# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience \${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
# Whether the compiler copes with passing no objects directly.
compiler_needs_object="no"
@@ -344,29 +344,26 @@ old_archive_from_new_cmds=""
old_archive_from_expsyms_cmds=""
# Commands used to build a shared archive.
-archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
- cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
- echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
- \$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module"
+archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
# Commands used to build a loadable module if different from building
# a shared archive.
-module_cmds=""
-module_expsym_cmds=""
+module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags"
+module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
# Whether we are building with GNU ld or not.
-with_gnu_ld="yes"
+with_gnu_ld="no"
# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
+allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
# Flag that enforces no undefined symbols.
no_undefined_flag=""
# Flag to hardcode $libdir into a binary during linking.
# This must work even if $libdir does not exist
-hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
+hardcode_libdir_flag_spec=""
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=""
@@ -392,14 +389,14 @@ hardcode_shlibpath_var=unsupported
# Set to "yes" if building a shared library automatically hardcodes DIR
# into the library and all subsequent libraries and executables linked
# against it.
-hardcode_automatic=no
+hardcode_automatic=yes
# Set to yes if linker adds runtime paths of dependent libraries
# to runtime path list.
inherit_rpath=no
# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
+link_all_deplibs=yes
# Set to "yes" if exported symbols are required.
always_export_symbols=no
@@ -1277,7 +1274,7 @@ exec_cmd=
# Append VALUE to the end of shell variable VAR.
func_append ()
{
- eval "${1}+=\${2}"
+eval "${1}+=\${2}"
} # Extended-shell func_append implementation
# func_append_quoted var value
@@ -1293,7 +1290,7 @@ func_append_quoted ()
# func_arith arithmetic-term...
func_arith ()
{
- func_arith_result=$(( $* ))
+func_arith_result=$(( $* ))
} # Extended-shell func_arith implementation
@@ -1301,7 +1298,7 @@ func_arith ()
# STRING may not start with a hyphen.
func_len ()
{
- func_len_result=${#1}
+func_len_result=${#1}
} # Extended-shell func_len implementation
@@ -1318,7 +1315,7 @@ func_lo2o ()
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=${1%.*}.lo
+func_xform_result=${1%.*}.lo
} # Extended-shell func_xform implementation
@@ -10094,17 +10091,17 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld"
# How to create reloadable object files.
reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
# Commands used to build an old-style archive.
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
# A language specific compiler.
-CC="x86_64-linux-gnu-g++"
+CC="g++"
# Is the compiler the GNU compiler?
with_gcc=yes
@@ -10113,13 +10110,13 @@ with_gcc=yes
no_builtin_flag=" -fno-builtin"
# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
+pic_flag=" -fno-common -DPIC"
# How to pass a linker flag through the compiler.
wl="-Wl,"
# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
+link_static_flag=""
# Does compiler simultaneously support -c and -o options?
compiler_c_o="yes"
@@ -10131,10 +10128,10 @@ build_libtool_need_lc=no
allow_libtool_libs_with_static_runtimes=no
# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
+export_dynamic_flag_spec=""
# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience \${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
# Whether the compiler copes with passing no objects directly.
compiler_needs_object="no"
@@ -10146,26 +10143,26 @@ old_archive_from_new_cmds=""
old_archive_from_expsyms_cmds=""
# Commands used to build a shared archive.
-archive_cmds="\$CC \$pic_flag -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$CC \$pic_flag -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
+archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module"
+archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
# Commands used to build a loadable module if different from building
# a shared archive.
-module_cmds=""
-module_expsym_cmds=""
+module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags"
+module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
# Whether we are building with GNU ld or not.
-with_gnu_ld="yes"
+with_gnu_ld="no"
# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
+allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
# Flag that enforces no undefined symbols.
no_undefined_flag=""
# Flag to hardcode $libdir into a binary during linking.
# This must work even if $libdir does not exist
-hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
+hardcode_libdir_flag_spec=""
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=""
@@ -10191,14 +10188,14 @@ hardcode_shlibpath_var=unsupported
# Set to "yes" if building a shared library automatically hardcodes DIR
# into the library and all subsequent libraries and executables linked
# against it.
-hardcode_automatic=no
+hardcode_automatic=yes
# Set to yes if linker adds runtime paths of dependent libraries
# to runtime path list.
inherit_rpath=no
# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
+link_all_deplibs=yes
# Set to "yes" if exported symbols are required.
always_export_symbols=no
@@ -10225,17 +10222,17 @@ file_list_spec=""
hardcode_action=immediate
# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs="/usr/lib/gcc/x86_64-linux-gnu/4.8 /usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu /usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /usr/lib/gcc/x86_64-linux-gnu/4.8/../../.."
+compiler_lib_search_dirs=""
# Dependencies to place before and after the objects being linked to
# create a shared library.
-predep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/4.8/crtbeginS.o"
-postdep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.8/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu/crtn.o"
+predep_objects=""
+postdep_objects=""
predeps=""
-postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
+postdeps=""
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.8 -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../.."
+compiler_lib_search_path=""
# ### END LIBTOOL TAG CONFIG: CXX
diff --git a/topology/test/Makefile b/topology/test/Makefile
index 59e509c..7a7cf9e 100644
--- a/topology/test/Makefile
+++ b/topology/test/Makefile
@@ -1,7 +1,7 @@
DATABASE=postgis_topo_regress
PSQL=psql
-PERL=/usr/bin/perl
+PERL=/opt/local/bin/perl
GEOS_NUMERIC_VERSION=30402
all:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git
More information about the Pkg-grass-devel
mailing list