diff options
| -rwxr-xr-x | debian/_base/dependencies/libcarddav/debian/rules | 8 | ||||
| -rwxr-xr-x | ubuntu/_base/dependencies/libcarddav/debian/rules | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/debian/_base/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules index da07780af..6dc35900d 100755 --- a/debian/_base/dependencies/libcarddav/debian/rules +++ b/debian/_base/dependencies/libcarddav/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) ifeq ($(DEB_TIME64_API),true) -DEB_TIME64_SUFFIX = 0t64 +DEB_TIME64_SUFFIX = t64 else DEB_TIME64_SUFFIX = endif @@ -31,11 +31,11 @@ post-patches:: ifeq ($(DEB_TIME64_API),true) # update library package name for TIME64 ABI ls -d debian/* | \ - grep -E "/libcarddav\." | \ + grep -E "/libcarddav0\." | \ grep -v "\.t64$$" | \ while read a; do \ [ -d $$a ] || [ -f $$a.t64 ] || \ - (cp -a $$a debian/libcarddav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + (cp -a $$a debian/libcarddav0$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ done [ -f debian/control.t64 ] || \ sed -i.t64 \ @@ -57,7 +57,7 @@ ifeq ($(DEB_TIME64_API),true) mv $$a $${a%.t64}; \ done ls -d debian/* | \ - grep -E "/libcarddav$(DEB_TIME64_SUFFIX)\." | \ + grep -E "/libcarddav0$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm [ -f debian/control.t64 ] || \ sed -i.t64 \ diff --git a/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules index da07780af..6dc35900d 100755 --- a/ubuntu/_base/dependencies/libcarddav/debian/rules +++ b/ubuntu/_base/dependencies/libcarddav/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) ifeq ($(DEB_TIME64_API),true) -DEB_TIME64_SUFFIX = 0t64 +DEB_TIME64_SUFFIX = t64 else DEB_TIME64_SUFFIX = endif @@ -31,11 +31,11 @@ post-patches:: ifeq ($(DEB_TIME64_API),true) # update library package name for TIME64 ABI ls -d debian/* | \ - grep -E "/libcarddav\." | \ + grep -E "/libcarddav0\." | \ grep -v "\.t64$$" | \ while read a; do \ [ -d $$a ] || [ -f $$a.t64 ] || \ - (cp -a $$a debian/libcarddav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + (cp -a $$a debian/libcarddav0$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ done [ -f debian/control.t64 ] || \ sed -i.t64 \ @@ -57,7 +57,7 @@ ifeq ($(DEB_TIME64_API),true) mv $$a $${a%.t64}; \ done ls -d debian/* | \ - grep -E "/libcarddav$(DEB_TIME64_SUFFIX)\." | \ + grep -E "/libcarddav0$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm [ -f debian/control.t64 ] || \ sed -i.t64 \ |