- Fix after objformat removal

Submitted by: pointyhat via kris
Approved by: maintainer
This commit is contained in:
Martin Wilke
2007-02-08 23:42:11 +00:00
parent 458949d042
commit ca2c3eebdb
3 changed files with 59 additions and 4 deletions

View File

@@ -0,0 +1,34 @@
--- Makefile.in.orig Fri Feb 9 01:16:19 2007
+++ Makefile.in Fri Feb 9 01:17:05 2007
@@ -62,9 +62,9 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
libpthread_stubs_la_LIBADD =
am__libpthread_stubs_la_SOURCES_DIST = stubs.c
-@BUILD_LIB_TRUE@am_libpthread_stubs_la_OBJECTS = stubs.lo
+am_libpthread_stubs_la_OBJECTS = stubs.lo
libpthread_stubs_la_OBJECTS = $(am_libpthread_stubs_la_OBJECTS)
-@BUILD_LIB_TRUE@am_libpthread_stubs_la_rpath = -rpath $(libdir)
+am_libpthread_stubs_la_rpath = -rpath $(libdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -102,8 +102,6 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_LIB_FALSE = @BUILD_LIB_FALSE@
-BUILD_LIB_TRUE = @BUILD_LIB_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -199,8 +197,8 @@
target_alias = @target_alias@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pthread-stubs.pc
-@BUILD_LIB_TRUE@lib_LTLIBRARIES = libpthread-stubs.la
-@BUILD_LIB_TRUE@libpthread_stubs_la_SOURCES = stubs.c
+lib_LTLIBRARIES = libpthread-stubs.la
+libpthread_stubs_la_SOURCES = stubs.c
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am

View File

@@ -1,11 +1,11 @@
--- configure.orig Wed Jan 24 17:10:44 2007
+++ configure Wed Jan 24 17:11:08 2007
--- configure.orig Wed Jan 24 17:10:44 2007
+++ configure Wed Jan 24 17:11:08 2007
@@ -20705,7 +20705,7 @@
_ACEOF
else
- PKG_CONFIG_LIBS='-L${libdir} -pthread-stubs'
+ PKG_CONFIG_LIBS='-L${libdir} -lpthread-stubs'
fi
done

View File

@@ -0,0 +1,21 @@
--- configure.old Fri Feb 2 12:45:00 2007
+++ configure Fri Feb 2 12:45:41 2007
@@ -9008,14 +9008,10 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
- if test -x /usr/bin/objformat; then
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
- freebsd[123]*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)