Sophie

Sophie

distrib > Mageia > 2 > i586 > media > core-release-src > by-pkgid > 7e1a5f01a5549ab633ba18be8aafc66d > files > 10

uClibc-0.9.30.3-2.mga1.src.rpm

diff -p -up uClibc-0.9.30.2-git/Makefile.in.abi_version~ uClibc-0.9.30.2-git/Makefile.in
--- uClibc-0.9.30.2-git/Makefile.in.abi_version~	2009-12-08 22:18:15.702286574 -0500
+++ uClibc-0.9.30.2-git/Makefile.in	2009-12-08 22:19:43.011923036 -0500
@@ -376,7 +376,7 @@ install_dev: install_headers all
 ifeq ($(HAVE_SHARED),y)
 	for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \
 	$(SED) -e 's/lib\///'` ; do \
-		$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
+		$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(VERSION) \
 		$(PREFIX)$(DEVEL_PREFIX)$(SHARED_LIB_DIRNAME)/$$i; \
 	done
 	if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(SHARED_LIB_DIRNAME)/$(SHARED_MAJORNAME) ] ; then \
@@ -388,10 +388,10 @@ ifeq ($(HAVE_SHARED),y)
 	fi
 ifeq ($(UCLIBC_HAS_THREADS),y)
 ifneq ($(LINUXTHREADS_OLD),y)
-	if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread.so.$(MAJOR_VERSION) ] ; then \
+	if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread.so.$(VERSION) ] ; then \
 		$(RM) $(PREFIX)$(DEVEL_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread.so; \
 		cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread.so; \
-		echo "GROUP ( $(RUNTIME_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread_nonshared.a )" \
+		echo "GROUP ( $(RUNTIME_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread.so.$(VERSION) $(DEVEL_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread_nonshared.a )" \
 			>> $(PREFIX)$(DEVEL_PREFIX)$(SHARED_LIB_DIRNAME)/libpthread.so; \
 	fi
 endif
diff -p -up uClibc-0.9.30.2-git/Rules.mak.abi_version~ uClibc-0.9.30.2-git/Rules.mak
--- uClibc-0.9.30.2-git/Rules.mak.abi_version~	2009-12-08 22:18:15.702286574 -0500
+++ uClibc-0.9.30.2-git/Rules.mak	2009-12-08 22:18:30.150156288 -0500
@@ -97,7 +97,7 @@ LC_ALL := C
 export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION LC_ALL
 
 LIBC := libc
-SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION)
+SHARED_MAJORNAME := $(LIBC).so.$(VERSION)
 ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
 UCLIBC_LDSO_NAME := ld64-uClibc
 ARCH_NATIVE_BIT := 64
@@ -105,17 +105,17 @@ else
 UCLIBC_LDSO_NAME := ld-uClibc
 ARCH_NATIVE_BIT := 32
 endif
-UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION)
+UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(VERSION)
 NONSHARED_LIBNAME := uclibc_nonshared.a
 libc := $(top_builddir)lib/$(SHARED_MAJORNAME)
-libc.depend := $(top_builddir)lib/$(SHARED_MAJORNAME:.$(MAJOR_VERSION)=)
+libc.depend := $(top_builddir)lib/$(SHARED_MAJORNAME:.$(VERSION)=)
 interp := $(top_builddir)lib/interp.os
 ldso := $(top_builddir)lib/$(UCLIBC_LDSO)
 headers_dep := $(top_builddir)include/bits/sysnum.h
 sub_headers := $(headers_dep)
 
 #LIBS :=$(interp) -L$(top_builddir)lib -lc
-LIBS := $(interp) -L$(top_builddir)lib $(libc:.$(MAJOR_VERSION)=)
+LIBS := $(interp) -L$(top_builddir)lib $(libc:.$(VERSION)=)
 
 # Make sure DESTDIR and PREFIX can be used to install
 # PREFIX is a uClibcism while DESTDIR is a common GNUism
diff -p -up uClibc-0.9.30.2-git/ldso/ldso/Makefile.in.abi_version~ uClibc-0.9.30.2-git/ldso/ldso/Makefile.in
--- uClibc-0.9.30.2-git/ldso/ldso/Makefile.in.abi_version~	2009-12-08 22:18:15.703298086 -0500
+++ uClibc-0.9.30.2-git/ldso/ldso/Makefile.in	2009-12-08 22:18:30.150156288 -0500
@@ -49,9 +49,9 @@ ldso-y := $($(UCLIBC_LDSO_NAME)_OBJS:.o=
 lib-so-y += $(ldso)
 objclean-y += $(UCLIBC_LDSO_NAME)_clean
 
-$(ldso): $(ldso:.$(MAJOR_VERSION)=)
-$(ldso:.$(MAJOR_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
-	$(call link.so,$(ldso_FULL_NAME),$(MAJOR_VERSION))
+$(ldso): $(ldso:.$(VERSION)=)
+$(ldso:.$(VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
+	$(call link.so,$(ldso_FULL_NAME),$(VERSION))
 
 $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
 	$(Q)$(RM) $@
diff -p -up uClibc-0.9.30.2-git/ldso/libdl/Makefile.in.abi_version~ uClibc-0.9.30.2-git/ldso/libdl/Makefile.in
--- uClibc-0.9.30.2-git/ldso/libdl/Makefile.in.abi_version~	2009-12-08 22:18:15.703298086 -0500
+++ uClibc-0.9.30.2-git/ldso/libdl/Makefile.in	2009-12-08 22:18:30.151174155 -0500
@@ -42,7 +42,7 @@ lib-so-y += $(top_builddir)lib/libdl.so
 objclean-y += libdl_clean
 
 $(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(libc.depend)
-	$(call link.so,$(libdl_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libdl_FULL_NAME),$(VERSION))
 
 $(libdl_OUT)/libdl_so.a: $(libdl-so-y)
 	$(Q)$(RM) $@
diff -p -up uClibc-0.9.30.2-git/libc/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libc/Makefile.in
--- uClibc-0.9.30.2-git/libc/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libc/Makefile.in	2009-12-08 22:18:30.151174155 -0500
@@ -19,7 +19,7 @@ LDFLAGS-libc.so := $(LDFLAGS) $(VERSION_
 
 LIBS-libc.so := $(interp) $(ldso) $(top_builddir)lib/$(NONSHARED_LIBNAME)
 
-# we have SHARED_MAJORNAME=libc.so.$(MAJOR_VERSION) defined in Rules.mak
+# we have SHARED_MAJORNAME=libc.so.$(VERSION) defined in Rules.mak
 libc_FULL_NAME := libuClibc-$(VERSION).so
 
 # this comes first, so duplicate removal works correctly
@@ -58,10 +58,10 @@ OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--ve
 
 ifeq ($(DOMULTI),n)
 $(libc.depend): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
-	$(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libc_FULL_NAME),$(VERSION))
 else
 $(libc.depend): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so)
-	$(call linkm.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
+	$(call linkm.so,$(libc_FULL_NAME),$(VERSION))
 endif
 	$(Q)$(RM) $@
 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
diff -p -up uClibc-0.9.30.2-git/libcrypt/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libcrypt/Makefile.in
--- uClibc-0.9.30.2-git/libcrypt/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libcrypt/Makefile.in	2009-12-08 22:18:30.151174155 -0500
@@ -45,10 +45,10 @@ $(top_builddir)lib/libcrypt.so: $(top_bu
 else
 $(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt_so.a $(libc.depend)
 endif
-	$(call link.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libcrypt_FULL_NAME),$(VERSION))
 else
 $(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.oS | $(libc.depend)
-	$(call linkm.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION))
+	$(call linkm.so,$(libcrypt_FULL_NAME),$(VERSION))
 endif
 
 $(libcrypt_OUT)/libcrypt_so.a: $(libcrypt-so-y)
diff -p -up uClibc-0.9.30.2-git/libintl/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libintl/Makefile.in
--- uClibc-0.9.30.2-git/libintl/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libintl/Makefile.in	2009-12-08 22:18:30.151174155 -0500
@@ -45,10 +45,10 @@ $(top_builddir)lib/libintl.so: $(top_bui
 else
 $(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl_so.a $(libc)
 endif
-	$(call link.so,$(libintl_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libintl_FULL_NAME),$(VERSION))
 else
 $(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl.oS | $(libc)
-	$(call linkm.so,$(libintl_FULL_NAME),$(MAJOR_VERSION))
+	$(call linkm.so,$(libintl_FULL_NAME),$(VERSION))
 endif
 
 $(libintl_OUT)/libintl_so.a: $(libintl-so-y)
diff -p -up uClibc-0.9.30.2-git/libm/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libm/Makefile.in
--- uClibc-0.9.30.2-git/libm/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libm/Makefile.in	2009-12-08 22:18:30.151174155 -0500
@@ -170,10 +170,10 @@ $(top_builddir)lib/libm.so: $(top_buildd
 else
 $(top_builddir)lib/libm.so: $(libm_OUT)/libm_so.a $(libc.depend)
 endif
-	$(call link.so,$(libm_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libm_FULL_NAME),$(VERSION))
 else
 $(top_builddir)lib/libm.so: $(libm_OUT)/libm.oS | $(libc.depend)
-	$(call linkm.so,$(libm_FULL_NAME),$(MAJOR_VERSION))
+	$(call linkm.so,$(libm_FULL_NAME),$(VERSION))
 endif
 
 $(libm_OUT)/libm_so.a: $(libm-so-y)
diff -p -up uClibc-0.9.30.2-git/libnsl/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libnsl/Makefile.in
--- uClibc-0.9.30.2-git/libnsl/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libnsl/Makefile.in	2009-12-08 22:18:30.151174155 -0500
@@ -35,7 +35,7 @@ $(top_builddir)lib/libnsl.so: $(top_buil
 else
 $(top_builddir)lib/libnsl.so: $(libnsl_OUT)/libnsl_so.a $(libc.depend)
 endif
-	$(call link.so,$(libnsl_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libnsl_FULL_NAME),$(VERSION))
 
 $(libnsl_OUT)/libnsl_so.a: $(libnsl-so-y)
 	$(Q)$(RM) $@
diff -p -up uClibc-0.9.30.2-git/libpthread/linuxthreads.old/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libpthread/linuxthreads.old/Makefile.in
--- uClibc-0.9.30.2-git/libpthread/linuxthreads.old/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libpthread/linuxthreads.old/Makefile.in	2009-12-08 22:18:30.152174423 -0500
@@ -74,10 +74,10 @@ lib-so-$(UCLIBC_HAS_THREADS) += $(top_bu
 
 #ifeq ($(DOMULTI),n)
 $(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend)
-	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libpthread_FULL_NAME),$(VERSION))
 #else
 #$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend)
-#	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+#	$(call linkm.so,$(libpthread_FULL_NAME),$(VERSION))
 #endif
 
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
diff -p -up uClibc-0.9.30.2-git/libpthread/linuxthreads.old_db/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libpthread/linuxthreads.old_db/Makefile.in
--- uClibc-0.9.30.2-git/libpthread/linuxthreads.old_db/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libpthread/linuxthreads.old_db/Makefile.in	2009-12-08 22:18:30.152174423 -0500
@@ -6,7 +6,7 @@
 #
 
 # Get the thread include dependencies and shared object name
-CFLAGS-linuxthreads.old_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\""
+CFLAGS-linuxthreads.old_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(VERSION)\""
 
 LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols)
 ifeq ($(DOSTRIP),y)
diff -p -up uClibc-0.9.30.2-git/libpthread/linuxthreads/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libpthread/linuxthreads/Makefile.in
--- uClibc-0.9.30.2-git/libpthread/linuxthreads/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libpthread/linuxthreads/Makefile.in	2009-12-08 22:18:30.152174423 -0500
@@ -84,14 +84,14 @@ lib-so-$(UCLIBC_HAS_THREADS) += $(top_bu
 
 #ifeq ($(DOMULTI),n)
 $(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
-	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libpthread_FULL_NAME),$(VERSION))
 #else
 #$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
-#	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+#	$(call linkm.so,$(libpthread_FULL_NAME),$(VERSION))
 #endif
 	$(Q)$(RM) $@
 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
-	$(Q)echo "GROUP ( $(notdir $@).$(MAJOR_VERSION) libpthread_nonshared.a )" >> $@
+	$(Q)echo "GROUP ( $(notdir $@).$(VERSION) libpthread_nonshared.a )" >> $@
 
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
 $(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
diff -p -up uClibc-0.9.30.2-git/libpthread/linuxthreads_db/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libpthread/linuxthreads_db/Makefile.in
--- uClibc-0.9.30.2-git/libpthread/linuxthreads_db/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libpthread/linuxthreads_db/Makefile.in	2009-12-08 22:18:30.152174423 -0500
@@ -6,7 +6,7 @@
 #
 
 # Get the thread include dependencies and shared object name
-CFLAGS-linuxthreads_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\""
+CFLAGS-linuxthreads_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(VERSION)\""
 
 LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols)
 ifeq ($(DOSTRIP),y)
diff -p -up uClibc-0.9.30.2-git/libresolv/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libresolv/Makefile.in
--- uClibc-0.9.30.2-git/libresolv/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libresolv/Makefile.in	2009-12-08 22:18:30.153184957 -0500
@@ -35,7 +35,7 @@ $(top_builddir)lib/libresolv.so: $(top_b
 else
 $(top_builddir)lib/libresolv.so: $(libresolv_OUT)/libresolv_so.a $(libc.depend)
 endif
-	$(call link.so,$(libresolv_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libresolv_FULL_NAME),$(VERSION))
 
 $(libresolv_OUT)/libresolv_so.a: $(libresolv-so-y)
 	$(Q)$(RM) $@
diff -p -up uClibc-0.9.30.2-git/librt/Makefile.in.abi_version~ uClibc-0.9.30.2-git/librt/Makefile.in
--- uClibc-0.9.30.2-git/librt/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/librt/Makefile.in	2009-12-08 22:18:30.153184957 -0500
@@ -36,7 +36,7 @@ $(top_builddir)lib/librt.so: $(top_build
 else
 $(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc.depend)
 endif
-	$(call link.so,$(librt_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(librt_FULL_NAME),$(VERSION))
 
 $(librt_OUT)/librt_so.a: $(librt-so-y)
 	$(Q)$(RM) $@
diff -p -up uClibc-0.9.30.2-git/libutil/Makefile.in.abi_version~ uClibc-0.9.30.2-git/libutil/Makefile.in
--- uClibc-0.9.30.2-git/libutil/Makefile.in.abi_version~	2009-11-19 10:29:47.000000000 -0500
+++ uClibc-0.9.30.2-git/libutil/Makefile.in	2009-12-08 22:18:30.153184957 -0500
@@ -43,10 +43,10 @@ $(top_builddir)lib/libutil.so: $(top_bui
 else
 $(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil_so.a $(libc.depend)
 endif
-	$(call link.so,$(libutil_FULL_NAME),$(MAJOR_VERSION))
+	$(call link.so,$(libutil_FULL_NAME),$(VERSION))
 else
 $(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil.oS | $(libc.depend)
-	$(call linkm.so,$(libutil_FULL_NAME),$(MAJOR_VERSION))
+	$(call linkm.so,$(libutil_FULL_NAME),$(VERSION))
 endif
 
 $(libutil_OUT)/libutil_so.a: $(libutil-so-y)