svn commit: trunk/uClibc: ldso/ldso ldso/libdl libc libcrypt libi etc...
vapier at uclibc.org
vapier at uclibc.org
Mon Mar 19 09:49:05 UTC 2007
Author: vapier
Date: 2007-03-19 02:49:04 -0700 (Mon, 19 Mar 2007)
New Revision: 18155
Log:
#1273 if EXTRAVERSION is set, make sure we respect it
Modified:
trunk/uClibc/Makefile.in
trunk/uClibc/Rules.mak
trunk/uClibc/ldso/ldso/Makefile.in
trunk/uClibc/ldso/libdl/Makefile.in
trunk/uClibc/libc/Makefile.in
trunk/uClibc/libcrypt/Makefile.in
trunk/uClibc/libintl/Makefile.in
trunk/uClibc/libm/Makefile.in
trunk/uClibc/libnsl/Makefile.in
trunk/uClibc/libpthread/linuxthreads.old/Makefile.in
trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in
trunk/uClibc/libpthread/linuxthreads/Makefile.in
trunk/uClibc/libpthread/linuxthreads_db/Makefile.in
trunk/uClibc/libresolv/Makefile.in
trunk/uClibc/librt/Makefile.in
trunk/uClibc/libutil/Makefile.in
Changeset:
Modified: trunk/uClibc/Makefile.in
===================================================================
--- trunk/uClibc/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -261,13 +261,13 @@
install_runtime:
ifeq ($(HAVE_SHARED),y)
$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
- $(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+ $(INSTALL) -m 644 lib/lib*-$(VERSION).so \
$(PREFIX)$(RUNTIME_PREFIX)lib
cd lib && $(TAR) -cf - *.so.* | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib
- @if [ -x lib/$(UCLIBC_LDSO_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
+ @if [ -x lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \
set -e; \
$(SHELL_SET_X); \
- $(INSTALL) -m 755 lib/$(UCLIBC_LDSO_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+ $(INSTALL) -m 755 lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so \
$(PREFIX)$(RUNTIME_PREFIX)lib; \
fi
endif
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/Rules.mak 2007-03-19 09:49:04 UTC (rev 18155)
@@ -78,7 +78,11 @@
MAJOR_VERSION := 0
MINOR_VERSION := 9
SUBLEVEL := 29
+EXTRAVERSION := 4
VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
+ifneq ($(EXTRAVERSION),)
+VERSION := $(VERSION).$(EXTRAVERSION)
+endif
# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
LC_ALL := C
export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION LC_ALL
Modified: trunk/uClibc/ldso/ldso/Makefile.in
===================================================================
--- trunk/uClibc/ldso/ldso/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/ldso/ldso/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -24,7 +24,7 @@
endif
LDFLAGS-$(UCLIBC_LDSO_NAME).so += -e _start -z now -Bsymbolic --export-dynamic --sort-common --discard-locals --discard-all --no-undefined
-ldso_FULL_NAME := $(UCLIBC_LDSO_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+ldso_FULL_NAME := $(UCLIBC_LDSO_NAME)-$(VERSION).so
$(UCLIBC_LDSO_NAME)_DIR := $(top_srcdir)ldso/ldso
$(UCLIBC_LDSO_NAME)_OUT := $(top_builddir)ldso/ldso
Modified: trunk/uClibc/ldso/libdl/Makefile.in
===================================================================
--- trunk/uClibc/ldso/libdl/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/ldso/libdl/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -21,7 +21,7 @@
LIBS-libdl.so := $(LIBS) $(ldso)
-libdl_FULL_NAME := libdl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libdl_FULL_NAME := libdl-$(VERSION).so
libdl_DIR := $(top_srcdir)ldso/libdl
libdl_OUT := $(top_builddir)ldso/libdl
Modified: trunk/uClibc/libc/Makefile.in
===================================================================
--- trunk/uClibc/libc/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libc/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -20,7 +20,7 @@
LIBS-libc.so := $(interp) $(ldso) $(top_builddir)lib/$(NONSHARED_LIBNAME)
# we have SHARED_MAJORNAME=libc.so.$(MAJOR_VERSION) defined in Rules.mak
-libc_FULL_NAME := libuClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libc_FULL_NAME := libuClibc-$(VERSION).so
# this comes first, so duplicate removal works correctly
include $(libc_DIR)/sysdeps/Makefile.in
Modified: trunk/uClibc/libcrypt/Makefile.in
===================================================================
--- trunk/uClibc/libcrypt/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libcrypt/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -11,7 +11,7 @@
LIBS-libcrypt.so := $(LIBS)
-libcrypt_FULL_NAME := libcrypt-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libcrypt_FULL_NAME := libcrypt-$(VERSION).so
libcrypt_DIR := $(top_srcdir)libcrypt
libcrypt_OUT := $(top_builddir)libcrypt
Modified: trunk/uClibc/libintl/Makefile.in
===================================================================
--- trunk/uClibc/libintl/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libintl/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -11,7 +11,7 @@
LIBS-libintl.so := $(LIBS)
-libintl_FULL_NAME := libintl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libintl_FULL_NAME := libintl-$(VERSION).so
MOBJ := \
gettext.o ngettext.o dgettext.o dcgettext.o dngettext.o dcngettext.o \
Modified: trunk/uClibc/libm/Makefile.in
===================================================================
--- trunk/uClibc/libm/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libm/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -27,7 +27,7 @@
LIBS-libm.so := $(LIBS)
-libm_FULL_NAME := libm-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libm_FULL_NAME := libm-$(VERSION).so
libm_ARCH_DIR:=$(top_srcdir)libm/$(TARGET_ARCH)
libm_ARCH_OUT:=$(top_builddir)libm/$(TARGET_ARCH)
Modified: trunk/uClibc/libnsl/Makefile.in
===================================================================
--- trunk/uClibc/libnsl/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libnsl/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -11,7 +11,7 @@
LIBS-libnsl.so := $(LIBS)
-libnsl_FULL_NAME := libnsl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libnsl_FULL_NAME := libnsl-$(VERSION).so
libnsl_DIR := $(top_srcdir)libnsl
libnsl_OUT := $(top_builddir)libnsl
Modified: trunk/uClibc/libpthread/linuxthreads/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libpthread/linuxthreads/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -29,7 +29,7 @@
START_FILE-libpthread.so := $(SHARED_START_FILES)
END_FILE-libpthread.so := $(SHARED_END_FILES)
-libpthread_FULL_NAME := libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libpthread_FULL_NAME := libpthread-$(VERSION).so
libpthread_DIR := $(top_srcdir)libpthread/linuxthreads
libpthread_OUT := $(top_builddir)libpthread/linuxthreads
Modified: trunk/uClibc/libpthread/linuxthreads.old/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads.old/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libpthread/linuxthreads.old/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -22,7 +22,7 @@
START_FILE-libpthread.so := $(SHARED_START_FILES)
END_FILE-libpthread.so := $(SHARED_END_FILES)
-libpthread_FULL_NAME := libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libpthread_FULL_NAME := libpthread-$(VERSION).so
libpthread_DIR := $(top_srcdir)libpthread/linuxthreads.old
libpthread_OUT := $(top_builddir)libpthread/linuxthreads.old
Modified: trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -15,7 +15,7 @@
LIBS-libthread_db.so := $(LIBS)
-libthread_db_FULL_NAME := libthread_db-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libthread_db_FULL_NAME := libthread_db-$(VERSION).so
libthread_db_DIR := $(top_srcdir)libpthread/linuxthreads.old_db
libthread_db_OUT := $(top_builddir)libpthread/linuxthreads.old_db
Modified: trunk/uClibc/libpthread/linuxthreads_db/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads_db/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libpthread/linuxthreads_db/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -15,7 +15,7 @@
LIBS-libthread_db.so := $(LIBS)
-libthread_db_FULL_NAME := libthread_db-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libthread_db_FULL_NAME := libthread_db-$(VERSION).so
libthread_db_DIR := $(top_srcdir)libpthread/linuxthreads_db
libthread_db_OUT := $(top_builddir)libpthread/linuxthreads_db
Modified: trunk/uClibc/libresolv/Makefile.in
===================================================================
--- trunk/uClibc/libresolv/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libresolv/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -11,7 +11,7 @@
LIBS-libresolv.so := $(LIBS)
-libresolv_FULL_NAME := libresolv-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libresolv_FULL_NAME := libresolv-$(VERSION).so
libresolv_DIR := $(top_srcdir)libresolv
libresolv_OUT := $(top_builddir)libresolv
Modified: trunk/uClibc/librt/Makefile.in
===================================================================
--- trunk/uClibc/librt/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/librt/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -11,7 +11,7 @@
LIBS-librt.so := $(LIBS)
-librt_FULL_NAME := librt-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+librt_FULL_NAME := librt-$(VERSION).so
librt_DIR := $(top_srcdir)librt
librt_OUT := $(top_builddir)librt
Modified: trunk/uClibc/libutil/Makefile.in
===================================================================
--- trunk/uClibc/libutil/Makefile.in 2007-03-18 21:50:02 UTC (rev 18154)
+++ trunk/uClibc/libutil/Makefile.in 2007-03-19 09:49:04 UTC (rev 18155)
@@ -11,7 +11,7 @@
LIBS-libutil.so := $(LIBS)
-libutil_FULL_NAME := libutil-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libutil_FULL_NAME := libutil-$(VERSION).so
libutil_DIR := $(top_srcdir)libutil
libutil_OUT := $(top_builddir)libutil
More information about the uClibc-cvs
mailing list