1.1 --- a/patches/glibc/2.1.3/glibc-2.1.3-cygwin.patch Tue Aug 14 19:32:22 2007 +0000
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,80 +0,0 @@
1.4 -Fixes
1.5 -elf/librtld.os: In function `process_envvars': : undefined reference to `__access'
1.6 -...
1.7 -when building glibc-2.1.3 on cygwin
1.8 -
1.9 -Idea from
1.10 -http://sources.redhat.com/ml/bug-glibc/2002-01/msg00071/glibc-2.2-cygin-shared.patch
1.11 -backported to glibc-2.1.3.
1.12 -Basically, make glibc use .oST as suffix for 'object static'
1.13 -instead of .oS, since cygwin has trouble distinguishing .os from .oS
1.14 -(Original patch had .on, but .oST is more mnemonic for 'object static')
1.15 -
1.16 -
1.17 ---- glibc-2.1.3/Makeconfig.old 1999-11-29 11:19:20.000000000 -0800
1.18 -+++ glibc-2.1.3/Makeconfig 2004-03-14 16:38:43.218750000 -0800
1.19 -@@ -406,7 +406,7 @@
1.20 - # run the linked programs.
1.21 - link-libc = -Wl,-rpath-link=$(rpath-link) \
1.22 - $(common-objpfx)libc.so$(libc.so-version) \
1.23 -- $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
1.24 -+ $(common-objpfx)$(patsubst %,$(libtype.oST),c) $(gnulib)
1.25 - # Choose the default search path for the dynamic linker based on
1.26 - # where we will install libraries.
1.27 - ifneq ($(libdir),$(slibdir))
1.28 -@@ -586,7 +586,7 @@
1.29 - # The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})
1.30 - # to pass different flags for each flavor.
1.31 - libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))
1.32 --all-object-suffixes := .o .os .op .og .ob .oS
1.33 -+all-object-suffixes := .o .os .op .og .ob .oST
1.34 - object-suffixes :=
1.35 - CPPFLAGS-.o = $(pic-default)
1.36 - CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
1.37 -@@ -636,14 +636,14 @@
1.38 -
1.39 - ifeq (yes,$(build-shared))
1.40 - # Build special library that contains the static-only routines for libc.
1.41 --object-suffixes-for-libc += .oS
1.42 -+object-suffixes-for-libc += .oST
1.43 -
1.44 - # Must build the routines as PIC, though, because they can end up in (users')
1.45 - # shared objects. We don't want to use CFLAGS-os because users may, for
1.46 - # example, make that processor-specific.
1.47 --CFLAGS-.oS = $(CFLAGS-.o) $(pic-ccflag)
1.48 --CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC
1.49 --libtype.oS = lib%_nonshared.a
1.50 -+CFLAGS-.oST = $(CFLAGS-.o) $(pic-ccflag)
1.51 -+CPPFLAGS-.oST = $(CPPFLAGS-.o) -DPIC
1.52 -+libtype.oST = lib%_nonshared.a
1.53 - endif
1.54 -
1.55 -
1.56 ---- glibc-2.1.3/Makerules.old 1999-08-01 15:12:23.000000000 -0700
1.57 -+++ glibc-2.1.3/Makerules 2004-03-14 16:39:07.906250000 -0800
1.58 -@@ -386,7 +386,7 @@
1.59 - static-only-routines =
1.60 - endif
1.61 -
1.62 --elide-routines.oS += $(filter-out $(static-only-routines),\
1.63 -+elide-routines.oST += $(filter-out $(static-only-routines),\
1.64 - $(routines) $(aux) $(sysdep_routines))
1.65 - elide-routines.os += $(static-only-routines)
1.66 -
1.67 -@@ -694,14 +694,14 @@
1.68 - # of the files are taken by the linker.
1.69 - install: $(inst_libdir)/libc.so
1.70 - $(inst_libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
1.71 -- $(inst_libdir)/$(patsubst %,$(libtype.oS),\
1.72 -+ $(inst_libdir)/$(patsubst %,$(libtype.oST),\
1.73 - $(libprefix)$(libc-name)) \
1.74 - $(+force)
1.75 - (echo '/* GNU ld script';\
1.76 - echo ' Use the shared library, but some functions are only in';\
1.77 - echo ' the static library, so try that secondarily. */';\
1.78 - echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
1.79 -- '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
1.80 -+ '$(libdir)/$(patsubst %,$(libtype.oST),$(libprefix)$(libc-name))'\
1.81 - ')' \
1.82 - ) > $@.new
1.83 - mv -f $@.new $@