1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.3.4/glibc-2.3.4-cygwin.patch Sat Feb 24 11:00:05 2007 +0000
1.3 @@ -0,0 +1,166 @@
1.4 +Fixes
1.5 +elf/librtld.os: In function `process_envvars': : undefined reference to `__access'
1.6 +...
1.7 +when building glibc-2.3.4 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 +Basically, make glibc use .oST as suffix for 'object static'
1.12 +instead of .oS, since cygwin has trouble distinguishing .os from .oS
1.13 +(Original patch had .on, but .oST is more mnemonic for 'object static')
1.14 +
1.15 +glibc-linuxthreads-2.3.4 also requires a patch, see
1.16 +../glibc-linuxthreads-2.3.4/glibc-linuxthreads-2.3.4-cygwin.patch
1.17 +
1.18 +[ Ported to glibc-2.3.4 by steve@digidescorp.com ]
1.19 +
1.20 +--- glibc-2.3.4/Makeconfig.orig 2004-12-15 12:51:47.000000000 -0600
1.21 ++++ glibc-2.3.4/Makeconfig 2005-06-29 00:31:27.000000000 -0500
1.22 +@@ -449,7 +449,7 @@
1.23 + # run the linked programs.
1.24 + link-libc = -Wl,-rpath-link=$(rpath-link) \
1.25 + $(common-objpfx)libc.so$(libc.so-version) \
1.26 +- $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
1.27 ++ $(common-objpfx)$(patsubst %,$(libtype.oST),c) $(gnulib)
1.28 + # This is how to find at build-time things that will be installed there.
1.29 + rpath-dirs = math elf dlfcn nss nis rt resolv crypt
1.30 + endif
1.31 +@@ -667,7 +667,7 @@
1.32 + # The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})
1.33 + # to pass different flags for each flavor.
1.34 + libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))
1.35 +-all-object-suffixes := .o .os .op .og .ob .oS
1.36 ++all-object-suffixes := .o .os .op .og .ob .oST
1.37 + object-suffixes :=
1.38 + CPPFLAGS-.o = $(pic-default)
1.39 + CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
1.40 +@@ -723,14 +723,14 @@
1.41 +
1.42 + ifeq (yes,$(build-shared))
1.43 + # Build special library that contains the static-only routines for libc.
1.44 +-object-suffixes-for-libc += .oS
1.45 ++object-suffixes-for-libc += .oST
1.46 +
1.47 + # Must build the routines as PIC, though, because they can end up in (users')
1.48 + # shared objects. We don't want to use CFLAGS-os because users may, for
1.49 + # example, make that processor-specific.
1.50 +-CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag)
1.51 +-CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
1.52 +-libtype.oS = lib%_nonshared.a
1.53 ++CFLAGS-.oST = $(CFLAGS-.o) $(pic-ccflag)
1.54 ++CPPFLAGS-.oST = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
1.55 ++libtype.oST = lib%_nonshared.a
1.56 + endif
1.57 +
1.58 + # The assembler can generate debug information too.
1.59 +--- glibc-2.3.4/Makerules.orig 2005-06-28 20:57:52.562500000 -0500
1.60 ++++ glibc-2.3.4/Makerules 2005-06-29 00:27:21.328125000 -0500
1.61 +@@ -416,7 +416,7 @@
1.62 + # Bounded pointer thunks are only built for *.ob
1.63 + elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks))
1.64 +
1.65 +-elide-routines.oS += $(filter-out $(static-only-routines),\
1.66 ++elide-routines.oST += $(filter-out $(static-only-routines),\
1.67 + $(routines) $(aux) $(sysdep_routines)) \
1.68 + $(elide-bp-thunks)
1.69 + elide-routines.os += $(static-only-routines) $(elide-bp-thunks)
1.70 +@@ -968,7 +968,7 @@
1.71 + install: $(inst_libdir)/libc.so
1.72 + $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
1.73 + $(common-objpfx)libc.so$(libc.so-version) \
1.74 +- $(inst_libdir)/$(patsubst %,$(libtype.oS),\
1.75 ++ $(inst_libdir)/$(patsubst %,$(libtype.oST),\
1.76 + $(libprefix)$(libc-name)) \
1.77 + $(+force)
1.78 + (echo '/* GNU ld script';\
1.79 +@@ -976,7 +976,7 @@
1.80 + echo ' the static library, so try that secondarily. */';\
1.81 + cat $<; \
1.82 + echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
1.83 +- '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
1.84 ++ '$(libdir)/$(patsubst %,$(libtype.oST),$(libprefix)$(libc-name))'\
1.85 + ')' \
1.86 + ) > $@.new
1.87 + mv -f $@.new $@
1.88 +diff -aur glibc-2.3.5/extra-lib.mk glibc-2.3.5-cygwin/extra-lib.mk
1.89 +--- glibc-2.3.5/extra-lib.mk 2004-12-02 23:54:47.000000000 +0100
1.90 ++++ glibc-2.3.5-cygwin/extra-lib.mk 2005-05-11 08:27:28.156250000 +0200
1.91 +@@ -13,7 +13,7 @@
1.92 +
1.93 + ifneq (,$($(lib)-static-only-routines))
1.94 + ifneq (,$(filter yesyes%,$(build-shared)$(elf)$($(lib).so-version)))
1.95 +-object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oS)
1.96 ++object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oST)
1.97 + endif
1.98 + endif
1.99 +
1.100 +@@ -29,7 +29,7 @@
1.101 +
1.102 + # Add each flavor of library to the lists of things to build and install.
1.103 + install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
1.104 +-extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\
1.105 ++extra-objs += $(foreach o,$(filter-out .os .oST,$(object-suffixes-$(lib))),\
1.106 + $(patsubst %,%$o,$(filter-out \
1.107 + $($(lib)-shared-only-routines),\
1.108 + $(all-$(lib)-routines))))
1.109 +@@ -57,7 +57,7 @@
1.110 +
1.111 +
1.112 + # Use o-iterator.mk to generate a rule for each flavor of library.
1.113 +-ifneq (,$(filter-out .os .oS,$(object-suffixes-$(lib))))
1.114 ++ifneq (,$(filter-out .os .oST,$(object-suffixes-$(lib))))
1.115 + define o-iterator-doit
1.116 + $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
1.117 + $(patsubst %,$(objpfx)%$o,\
1.118 +@@ -65,7 +65,7 @@
1.119 + $(all-$(lib)-routines))); \
1.120 + $$(build-extra-lib)
1.121 + endef
1.122 +-object-suffixes-left = $(filter-out .os .oS,$(object-suffixes-$(lib)))
1.123 ++object-suffixes-left = $(filter-out .os .oST,$(object-suffixes-$(lib)))
1.124 + include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))
1.125 + endif
1.126 +
1.127 +@@ -77,9 +77,9 @@
1.128 + $(build-extra-lib)
1.129 + endif
1.130 +
1.131 +-ifneq (,$(filter .oS,$(object-suffixes-$(lib))))
1.132 +-$(objpfx)$(patsubst %,$(libtype.oS),$(lib:lib%=%)): \
1.133 +- $(patsubst %,$(objpfx)%.oS,\
1.134 ++ifneq (,$(filter .oST,$(object-suffixes-$(lib))))
1.135 ++$(objpfx)$(patsubst %,$(libtype.oST),$(lib:lib%=%)): \
1.136 ++ $(patsubst %,$(objpfx)%.oST,\
1.137 + $(filter $($(lib)-static-only-routines),\
1.138 + $(all-$(lib)-routines)))
1.139 + $(build-extra-lib)
1.140 +diff -aur glibc-2.3.5/nptl/Makefile glibc-2.3.5-cygwin/nptl/Makefile
1.141 +--- glibc-2.3.5/nptl/Makefile 2005-02-16 09:45:56.000000000 +0100
1.142 ++++ glibc-2.3.5-cygwin/nptl/Makefile 2005-05-11 08:26:01.812500000 +0200
1.143 +@@ -360,7 +360,7 @@
1.144 +
1.145 + $(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
1.146 + $(objpfx)libpthread.so$(libpthread.so-version) \
1.147 +- $(inst_libdir)/$(patsubst %,$(libtype.oS),\
1.148 ++ $(inst_libdir)/$(patsubst %,$(libtype.oST),\
1.149 + $(libprefix)pthread) \
1.150 + $(+force)
1.151 + (echo '/* GNU ld script';\
1.152 +@@ -368,7 +368,7 @@
1.153 + echo ' the static library, so try that secondarily. */';\
1.154 + cat $<; \
1.155 + echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \
1.156 +- '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\
1.157 ++ '$(libdir)/$(patsubst %,$(libtype.oST),$(libprefix)pthread)'\
1.158 + ')' \
1.159 + ) > $@.new
1.160 + mv -f $@.new $@
1.161 +diff -aur glibc-2.3.5/sysdeps/sparc/sparc32/sparcv9/Makefile glibc-2.3.5-cygwin/sysdeps/sparc/sparc32/sparcv9/Makefile
1.162 +--- glibc-2.3.5/sysdeps/sparc/sparc32/sparcv9/Makefile 2004-08-16 08:46:14.000000000 +0200
1.163 ++++ glibc-2.3.5-cygwin/sysdeps/sparc/sparc32/sparcv9/Makefile 2005-05-11 08:26:25.937500000 +0200
1.164 +@@ -10,4 +10,4 @@
1.165 + ASFLAGS-.op += -Wa,-Av9a
1.166 + ASFLAGS-.og += -Wa,-Av9a
1.167 + ASFLAGS-.ob += -Wa,-Av9a
1.168 +-ASFLAGS-.oS += -Wa,-Av9a
1.169 ++ASFLAGS-.oST += -Wa,-Av9a