r6536 - glibc-package/branches/glibc-2.21/debian
Author: aurel32
Date: 2015-09-09 15:35:19 +0000 (Wed, 09 Sep 2015)
New Revision: 6536
Removed:
glibc-package/branches/glibc-2.21/debian/shlibver
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/rules
Log:
Use $(GLIBC_VERSION) for shlib, instead of defining the version in a
separate shlibver file.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-09-09 15:28:28 UTC (rev 6535)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-09-09 15:35:19 UTC (rev 6536)
@@ -32,6 +32,8 @@
* libc6.1.symbols.alpha: remove invoke_dynamic_linker from libpcprofile.so.
It has disappeared, but it is a private library.
* Remove debver2localesdep.pl, it is unused since 2.19-16.
+ * Use $(GLIBC_VERSION) for shlib, instead of defining the version in a
+ separate shlibver file.
[ Steven Chamberlain ]
* sysdeps/kfreebsd.mk: find kfreebsd-kernel-headers in multiarch path.
Modified: glibc-package/branches/glibc-2.21/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules 2015-09-09 15:28:28 UTC (rev 6535)
+++ glibc-package/branches/glibc-2.21/debian/rules 2015-09-09 15:35:19 UTC (rev 6536)
@@ -32,10 +32,6 @@
stamp := $(CURDIR)/stamp-dir/
DUMMY := $(shell mkdir -p $(stamp))
-# The minimum package version with which these packages are compatible.
-include debian/shlibver
-shlib_dep = $(libc) (>= $(shlib_dep_ver))
-
# Beyond here you shouldn't need to customise anything:
export SHELL = /bin/bash -e
@@ -58,6 +54,9 @@
DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
GLIBC_VERSION = $(shell echo $(DEB_VERSION) | sed -e 's/.*://' -e 's/-.*//')
+# The minimum package version with which these packages are compatible.
+shlib_dep = $(libc) (>= $(GLIBC_VERSION))
+
DEB_BUILDDIR ?= $(build-tree)/$(DEB_HOST_ARCH)-$(curpass)
GLIBC_SOURCES = $(addprefix $(shell basename $(CURDIR))/, \
Deleted: glibc-package/branches/glibc-2.21/debian/shlibver
===================================================================
--- glibc-package/branches/glibc-2.21/debian/shlibver 2015-09-09 15:28:28 UTC (rev 6535)
+++ glibc-package/branches/glibc-2.21/debian/shlibver 2015-09-09 15:35:19 UTC (rev 6536)
@@ -1 +0,0 @@
-shlib_dep_ver = 2.21
Reply to: