diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2017-12-13 01:52:23 -0800 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2018-01-03 10:39:50 +0100 |
| commit | b71ed933a87a3577db0dc7c51f5c1df92d368c32 (patch) | |
| tree | 09adb3d7e50de650d3848a33b886c7a44e864fd2 | |
| parent | 55c7eba9546df2317f1b5cbbd8f2f64936f7d33b (diff) | |
autotools: let caller suppress automatic lib dependencies
shlibs.local was used in combination with explicit ebook/ecal/ical
dependencies to replace the automatic dependencies. It needs to
be maintained together with those explicit dependencies, so it
makes more sense to use a file provided by the code which
calls make to build releases.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/shlibs.local | 7 | ||||
| -rw-r--r-- | src/src.am | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index d321011b..faa74db9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,7 +132,7 @@ TYPE_rpm = -R # - same for kdepimlibs5 -> libakonadi-kde4 # - kdebase-runtime became kde-runtime in Debian Wheezy REQUIRES_SED_KDE = -e 's/kdelibs5 ([^,]*),/kdelibs5 | libkdeui5,/g' -e 's/kdepimlibs5 ([^,]*),/kdepimlibs5 | libakonadi-kde4,/g' -e 's/kdebase-runtime/kdebase-runtime | kde-runtime/g' -REQUIRES_deb = --requires="'$(shell set -x; cd checkinstall/dist; LD_LIBRARY_PATH=$(distdir)/usr/lib:$(distdir)/usr/lib/syncevolution dpkg-shlibdeps -L$(srcdir)/src/shlibs.local --ignore-missing-info -O $$(for i in $$(find $(distdir) -type f -perm /u+x | grep -v -e client-test -e lib/syncevolution/backends/); do if file $$i | grep ELF >/dev/null; then echo $$i; fi; done) | sed $(REQUIRES_SED_KDE) -e 's/[^=]*=//')$(REQUIRES_deb_neon)$(REQUIRES_deb_ical)'" +REQUIRES_deb = --requires="'$(shell set -x; cd checkinstall/dist; LD_LIBRARY_PATH=$(distdir)/usr/lib:$(distdir)/usr/lib/syncevolution dpkg-shlibdeps -L$(EXTRA_SHLIBS_LOCAL) --ignore-missing-info -O $$(for i in $$(find $(distdir) -type f -perm /u+x | grep -v -e client-test -e lib/syncevolution/backends/); do if file $$i | grep ELF >/dev/null; then echo $$i; fi; done) | sed $(REQUIRES_SED_KDE) -e 's/[^=]*=//')$(REQUIRES_deb_neon)$(REQUIRES_deb_ical)'" if NEON_COMPATIBILITY # --enable-neon-compatibility in src/backends/webdav: # replace dependencies from linking with hard-coded dlopen() dependencies @@ -238,7 +238,7 @@ syncevolution-%-deb: checkinstall/dist/$(distdir) checkinstall/dist/debian/contr $(SYNCEVOLUTION_$*_DEB_ARGS) \ --pkgname=syncevolution-$* \ --pkgarch=all \ - --requires="'$(shell set -x; cd checkinstall/dist; LD_LIBRARY_PATH=$(distdir)/usr/lib:$(distdir)/usr/lib/syncevolution dpkg-shlibdeps -L$(srcdir)/src/shlibs.local --ignore-missing-info -O $$(for i in $(patsubst %,$(distdir)/usr/lib/syncevolution/backends/%.so,$(PLATFORM_FILES_$*)); do if file $$i | grep ELF >/dev/null; then echo $$i; fi; done) | sed $(REQUIRES_SED_KDE) -e 's/[^=]*=//'), $(PKGNAME) (= $(VERSION_deb)-$(RELEASE))$(SYNCEVOLUTION_$*_DEB_REQUIRES)'" \ + --requires="'$(shell set -x; cd checkinstall/dist; LD_LIBRARY_PATH=$(distdir)/usr/lib:$(distdir)/usr/lib/syncevolution dpkg-shlibdeps -L$(EXTRA_SHLIBS_LOCAL) --ignore-missing-info -O $$(for i in $(patsubst %,$(distdir)/usr/lib/syncevolution/backends/%.so,$(PLATFORM_FILES_$*)); do if file $$i | grep ELF >/dev/null; then echo $$i; fi; done) | sed $(REQUIRES_SED_KDE) -e 's/[^=]*=//'), $(PKGNAME) (= $(VERSION_deb)-$(RELEASE))$(SYNCEVOLUTION_$*_DEB_REQUIRES)'" \ --maintainer="'Patrick Ohly <patrick.ohly@gmx.de>'" \ --pkgsource='http://syncevolution.org' \ --pkggroup='$*' \ diff --git a/src/shlibs.local b/src/shlibs.local deleted file mode 100644 index ae955d3c..00000000 --- a/src/shlibs.local +++ /dev/null @@ -1,7 +0,0 @@ -# Evolution 3.10 -libebook-1.2 14 -libebook-contacts-1.2 0 -libecal-1.2 16 -libedataserver-1.2 18 -# libical v1 -libical 1 @@ -57,7 +57,6 @@ SYNCEVOLUTION_LDADD += @SYNCSOURCES@ SYNCEVOLUTION_DEP += @SYNCSOURCES@ endif dist_noinst_DATA += \ - src/shlibs.local \ src/synthesis-includes/Makefile.am \ src/synthesis-includes/Makefile.in |