From 362c9ff7f8aadb97d38092335ac17ad52b5e8ece Mon Sep 17 00:00:00 2001 From: Pavel Charvat Date: Tue, 7 Jan 2014 16:19:51 +0100 Subject: [PATCH] Packages: Removed customization of SONAME_SUFFIX to simplify Makefiles. --- charset/Makefile | 8 ++++---- images/Makefile | 8 ++++---- ucw/Makefile | 8 ++++---- ucw/default.cfg | 3 +-- ucw/perl/UCW/Configure/LibUCW.pm | 7 ------- xml/Makefile | 8 ++++---- 6 files changed, 17 insertions(+), 25 deletions(-) diff --git a/charset/Makefile b/charset/Makefile index 185bc992..d015aaa0 100644 --- a/charset/Makefile +++ b/charset/Makefile @@ -10,7 +10,7 @@ LIBCHARSET_DEPS=$(LIBUCW) $(o)/charset/libucw-charset$(LV).a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS))) $(o)/charset/libucw-charset$(LV)-pic.a: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS))) $(o)/charset/libucw-charset$(LV).so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS))) $(LIBCHARSET_DEPS) -$(o)/charset/libucw-charset$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR) +$(o)/charset/libucw-charset$(LV).so: SONAME_SUFFIX=.0 $(o)/charset/libucw-charset.pc: $(LIBCHARSET_DEPS) ifdef CONFIG_STATIC_PIC @@ -43,8 +43,8 @@ clean:: INSTALL_TARGETS+=install-libucw-charset-lib install-libucw-charset-lib: install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) - install -m 644 run/lib/libucw-charset$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.$(UCW_ABI_VERSION) - ln -sf libucw-charset$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.$(UCW_ABI_MAJOR) + install -m 644 run/lib/libucw-charset$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.0.0 + ln -sf libucw-charset$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.0 .PHONY: install-libucw-charset-lib INSTALL_TARGETS+=install-libucw-charset-api @@ -52,7 +52,7 @@ install-libucw-charset-api: install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/charset $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) install -m 644 $(addprefix run/include/charset/,$(LIBCHARSET_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/charset install -m 644 run/lib/pkgconfig/libucw-charset.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) - ln -sf libucw-charset$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so + ln -sf libucw-charset$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so install -m 644 run/lib/libucw-charset$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR) .PHONY: install-libucw-charset-api diff --git a/images/Makefile b/images/Makefile index be7fed3c..acd93bec 100644 --- a/images/Makefile +++ b/images/Makefile @@ -70,7 +70,7 @@ CONFIGS+=$(LIBIMAGES_CONFIGS) $(o)/images/libucw-images$(LV).a: $(addsuffix .o,$(addprefix $(o)/images/,$(LIBIMAGES_MODS))) $(o)/images/libucw-images$(LV)-pic.a: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS))) $(o)/images/libucw-images$(LV).so: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS))) $(LIBIMAGES_DEPS) -$(o)/images/libucw-images$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR) +$(o)/images/libucw-images$(LV).so: SONAME_SUFFIX=.0 $(o)/images/libucw-images$(LV).so: LIBS+=$(LIBIMAGES_LIBS) $(o)/images/libucw-images.pc: $(LIBIMAGES_DEPS) @@ -96,8 +96,8 @@ run/lib/pkgconfig/libucw-images.pc: $(o)/images/libucw-images.pc INSTALL_TARGETS+=install-libucw-images-lib install-libucw-images-lib: install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) - install -m 644 run/lib/libucw-images$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so.$(UCW_ABI_VERSION) - ln -sf libucw-images$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so.$(UCW_ABI_MAJOR) + install -m 644 run/lib/libucw-images$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so.0.0 + ln -sf libucw-images$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so.0 .PHONY: install-libucw-images-lib INSTALL_TARGETS+=install-libucw-images-api @@ -105,7 +105,7 @@ install-libucw-images-api: install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_INCLUDE_DIR)/images $(INSTALL_LIB_DIR) $(INSTALL_PKGCONFIG_DIR)) install -m 644 $(addprefix run/include/images/,$(LIBIMAGES_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/images install -m 644 run/lib/pkgconfig/libucw-images.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) - ln -sf libucw-images$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so + ln -sf libucw-images$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so install -m 644 run/lib/libucw-images$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR) .PHONY: install-libucw-images-api diff --git a/ucw/Makefile b/ucw/Makefile index 60007a22..651dea31 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -101,7 +101,7 @@ endif $(o)/ucw/libucw$(LV).a: $(addsuffix .o,$(LIBUCW_MOD_PATHS)) $(o)/ucw/libucw$(LV)-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS)) $(o)/ucw/libucw$(LV).so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS)) -$(o)/ucw/libucw$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR) +$(o)/ucw/libucw$(LV).so: SONAME_SUFFIX=.0 $(o)/ucw/libucw$(LV).so: LIBS+=$(LIBUCW_LIBS) ifdef CONFIG_STATIC_PIC @@ -200,8 +200,8 @@ CONFIGS+=libucw INSTALL_TARGETS+=install-libucw-lib install-libucw-lib: install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) - install -m 644 run/lib/libucw$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.$(UCW_ABI_VERSION) - ln -sf libucw$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.$(UCW_ABI_MAJOR) + install -m 644 run/lib/libucw$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0.0 + ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0 .PHONY: install-libucw-lib INSTALL_TARGETS+=install-libucw-api @@ -209,7 +209,7 @@ install-libucw-api: install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_MAIN_INCLUDES) autoconf.h config.h) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) - ln -sf libucw$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so + ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so install -m 644 run/lib/libucw$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR) .PHONY: install-libucw-api diff --git a/ucw/default.cfg b/ucw/default.cfg index 891abbf2..59fdde72 100644 --- a/ucw/default.cfg +++ b/ucw/default.cfg @@ -5,9 +5,8 @@ Set("UCW_VERSION" => "5.0-dev"); Set("UCW_VERSION_CODE" => 5000000); -# Name of libraries in packages (libucw$UCW_ABI_SUFFIX.so.$UCW_ABI_VERSION, etc.) +# Name of libraries in packages (libucw$UCW_ABI_SUFFIX.so.0.0, etc.) Set("UCW_ABI_SUFFIX" => "-" . Get("UCW_VERSION")); -Set("UCW_ABI_VERSION" => "0.0"); # Compile everything with debug information and ASSERT's UnSet("CONFIG_DEBUG"); diff --git a/ucw/perl/UCW/Configure/LibUCW.pm b/ucw/perl/UCW/Configure/LibUCW.pm index cdfde1d7..7feef1e2 100644 --- a/ucw/perl/UCW/Configure/LibUCW.pm +++ b/ucw/perl/UCW/Configure/LibUCW.pm @@ -89,13 +89,6 @@ if (IsSet("CONFIG_DARWIN")) { } } -if (Get("UCW_ABI_VERSION") =~ /^(\d+)\.\d+(\.\d+)?$/) { - Set("UCW_ABI_MAJOR", $1); -} -else { - Fail("Invalid syntax of UCW_ABI_VERSION"); -} - PostConfig { AtWrite { UCW::Configure::C::ConfigHeader("ucw/autoconf.h", [ diff --git a/xml/Makefile b/xml/Makefile index ab37a81d..567c8a6a 100644 --- a/xml/Makefile +++ b/xml/Makefile @@ -12,7 +12,7 @@ LIBXML_DEPS=$(LIBUCW) $(LIBCHARSET) $(o)/xml/libucw-xml$(LV).a: $(addsuffix .o,$(LIBXML_MOD_PATHS)) $(o)/xml/libucw-xml$(LV)-pic.a: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) $(o)/xml/libucw-xml$(LV).so: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) $(LIBXML_DEPS) -$(o)/xml/libucw-xml$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR) +$(o)/xml/libucw-xml$(LV).so: SONAME_SUFFIX=.0 $(o)/xml/libucw-xml.pc: $(LIBXML_DEPS) ifdef CONFIG_STATIC_PIC @@ -48,8 +48,8 @@ run/lib/pkgconfig/libucw-xml.pc: $(o)/xml/libucw-xml.pc INSTALL_TARGETS+=install-libucw-xml-lib install-libucw-xml-lib: install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) - install -m 644 run/lib/libucw-xml$(LV).so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.$(UCW_ABI_VERSION) - ln -sf libucw-xml$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.$(UCW_ABI_MAJOR) + install -m 644 run/lib/libucw-xml$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0.0 + ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0 .PHONY: install-libucw-xml-lib INSTALL_TARGETS+=install-libucw-xml-api @@ -57,6 +57,6 @@ install-libucw-xml-api: install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) install -m 644 run/lib/pkgconfig/libucw-xml.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) install -m 644 $(addprefix run/include/xml/,$(LIBXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml - ln -sf libucw-xml$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so + ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so install -m 644 run/lib/libucw-xml$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR) .PHONY: install-libucw-xml-api -- 2.39.5