summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-03-19 09:49:04 (GMT)
committerMike Frysinger <vapier@gentoo.org>2007-03-19 09:49:04 (GMT)
commit6bc45b2d57f845be8bc76b6071a223660605a58c (patch)
treeaffb241302283ab73a7bbdb58bb5b7756368353d
parenta9216d27455b7eaa726d20a31d5030a6381888ed (diff)
#1273 if EXTRAVERSION is set, make sure we respect it
-rw-r--r--Makefile.in6
-rw-r--r--Rules.mak4
-rw-r--r--ldso/ldso/Makefile.in2
-rw-r--r--ldso/libdl/Makefile.in2
-rw-r--r--libc/Makefile.in2
-rw-r--r--libcrypt/Makefile.in2
-rw-r--r--libintl/Makefile.in2
-rw-r--r--libm/Makefile.in2
-rw-r--r--libnsl/Makefile.in2
-rw-r--r--libpthread/linuxthreads.old/Makefile.in2
-rw-r--r--libpthread/linuxthreads.old_db/Makefile.in2
-rw-r--r--libpthread/linuxthreads/Makefile.in2
-rw-r--r--libpthread/linuxthreads_db/Makefile.in2
-rw-r--r--libresolv/Makefile.in2
-rw-r--r--librt/Makefile.in2
-rw-r--r--libutil/Makefile.in2
16 files changed, 21 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in
index f42a392..170005e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -261,13 +261,13 @@ endif
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
diff --git a/Rules.mak b/Rules.mak
index 3cc699f..c19908a 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -78,7 +78,11 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS
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
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index a927348..04c4f2c 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -24,7 +24,7 @@ LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS_NOSTRIP) -z defs
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
diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
index 76817ce..f187f06 100644
--- a/ldso/libdl/Makefile.in
+++ b/ldso/libdl/Makefile.in
@@ -21,7 +21,7 @@ LDFLAGS-libdl.so := $(LDFLAGS) -fini dl_cleanup
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
diff --git a/libc/Makefile.in b/libc/Makefile.in
index 0387bfa..6896952 100644
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@@ -20,7 +20,7 @@ LDFLAGS-libc.so := $(LDFLAGS) $(VERSION_SCRIPT) -init __uClibc_init
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
diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
index 3ebcd85..7364d3e 100644
--- a/libcrypt/Makefile.in
+++ b/libcrypt/Makefile.in
@@ -11,7 +11,7 @@ LDFLAGS-libcrypt.so := $(LDFLAGS)
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
diff --git a/libintl/Makefile.in b/libintl/Makefile.in
index afaf330..8a64a76 100644
--- a/libintl/Makefile.in
+++ b/libintl/Makefile.in
@@ -11,7 +11,7 @@ LDFLAGS-libintl.so := $(LDFLAGS)
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 \
diff --git a/libm/Makefile.in b/libm/Makefile.in
index bf6aafb..5b2fbff 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -27,7 +27,7 @@ LDFLAGS-libm.so := $(LDFLAGS)
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)
diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in
index 14fc3ed..15b07ee 100644
--- a/libnsl/Makefile.in
+++ b/libnsl/Makefile.in
@@ -11,7 +11,7 @@ LDFLAGS-libnsl.so := $(LDFLAGS)
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
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 9c15276..de74676 100644
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -22,7 +22,7 @@ LIBS-libpthread.so := $(LIBS) $(ldso)
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
diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in
index 96e1b94..0959919 100644
--- a/libpthread/linuxthreads.old_db/Makefile.in
+++ b/libpthread/linuxthreads.old_db/Makefile.in
@@ -15,7 +15,7 @@ endif
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
diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in
index a5f52ec..a662295 100644
--- a/libpthread/linuxthreads/Makefile.in
+++ b/libpthread/linuxthreads/Makefile.in
@@ -29,7 +29,7 @@ LIBS-libpthread.so := $(LIBS) $(ldso)
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
diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in
index d6ad700..23a9199 100644
--- a/libpthread/linuxthreads_db/Makefile.in
+++ b/libpthread/linuxthreads_db/Makefile.in
@@ -15,7 +15,7 @@ endif
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
diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in
index a7bb329..4afff4c 100644
--- a/libresolv/Makefile.in
+++ b/libresolv/Makefile.in
@@ -11,7 +11,7 @@ LDFLAGS-libresolv.so := $(LDFLAGS)
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
diff --git a/librt/Makefile.in b/librt/Makefile.in
index 8a30a18..d8aa87f 100644
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@@ -11,7 +11,7 @@ LDFLAGS-librt.so := $(LDFLAGS)
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
diff --git a/libutil/Makefile.in b/libutil/Makefile.in
index b42763d..c9f94c1 100644
--- a/libutil/Makefile.in
+++ b/libutil/Makefile.in
@@ -11,7 +11,7 @@ LDFLAGS-libutil.so := $(LDFLAGS)
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