From 0dfd033b8fc1f8a69bb572e4e7578998493efae4 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 12 Aug 2015 13:07:01 +0000 Subject: xyzzy fix (fixes https://bugs.gentoo.org/show_bug.cgi?id=541092) --- INSTALL | 8 ++++---- Makefile | 45 ++++++++++++++++++++++++++++++++------------- configure | 14 ++++++++++---- doc/index.html | 10 +++++----- doc/upgrade.html | 9 +++++++++ package/deps.mak | 4 ++-- package/info | 2 +- package/targets.mak | 14 +------------- tools/gen-deps.sh | 4 ++-- 9 files changed, 66 insertions(+), 44 deletions(-) diff --git a/INSTALL b/INSTALL index cfda3cf..b5599a9 100644 --- a/INSTALL +++ b/INSTALL @@ -6,10 +6,10 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 4.0 or later - - skalibs version 2.3.3.0 or later: http://skarnet.org/software/skalibs/ - - execline version 2.1.1.1 or later: http://skarnet.org/software/execline/ - - s6 version 2.1.3.0 or later: http://skarnet.org/software/s6/ - - s6-dns version 2.0.0.3 or later: http://skarnet.org/software/s6-dns/ + - skalibs version 2.3.6.1 or later: http://skarnet.org/software/skalibs/ + - execline version 2.1.3.1 or later: http://skarnet.org/software/execline/ + - s6 version 2.2.0.1 or later: http://skarnet.org/software/s6/ + - s6-dns version 2.0.0.5 or later: http://skarnet.org/software/s6-dns/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/Makefile b/Makefile index 3d49943..29a1875 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,24 @@ STATIC_LIBS := SHARED_LIBS := INTERNAL_LIBS := EXTRA_TARGETS := +LIB_DEFS := -include config.mak + +define library_definition = +LIB$(firstword $(subst =, ,$(1))) := lib$(lastword $(subst =, ,$(1))).$(if $(DO_ALLSTATIC),a,so).xyzzy +ifdef DO_SHARED +SHARED_LIBS += lib$(lastword $(subst =, ,$(1))).so.xyzzy +endif +ifdef DO_STATIC +STATIC_LIBS += lib$(lastword $(subst =, ,$(1))).a.xyzzy +endif +endef + include package/targets.mak + +$(foreach var,$(LIB_DEFS),$(eval $(call library_definition,$(var)))) + include package/deps.mak version_m := $(basename $(version)) @@ -67,19 +82,20 @@ ifneq ($(strip $(ALL_BINS)),) endif install: install-dynlib install-libexec install-bin install-sbin install-lib install-include -install-dynlib: $(SHARED_LIBS:lib%.so=$(DESTDIR)$(dynlibdir)/lib%.so) +install-dynlib: $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(dynlibdir)/lib%.so) install-libexec: $(LIBEXEC_TARGETS:%=$(DESTDIR)$(libexecdir)/%) install-bin: $(BIN_TARGETS:%=$(DESTDIR)$(bindir)/%) install-sbin: $(SBIN_TARGETS:%=$(DESTDIR)$(sbindir)/%) -install-lib: $(STATIC_LIBS:lib%.a=$(DESTDIR)$(libdir)/lib%.a) +install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a) install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h) +install-data: $(ALL_DATA:src/etc/%=$(DESTDIR)$(datadir)/%) ifneq ($(exthome),) update: exec $(INSTALL) -l $(notdir $(home)) $(DESTDIR)$(exthome) -global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so=$(DESTDIR)$(sproot)/library.so/lib%.so) $(BIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(SBIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) +global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(sproot)/library.so/lib%.so) $(BIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(SBIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(DESTDIR)$(sproot)/command/%: $(DESTDIR)$(home)/command/% exec $(INSTALL) -D -l ..$(subst $(sproot),,$(exthome))/command/$( A POSIX-compliant system with a standard C development environment
  • GNU make, version 4.0 or later
  • skalibs version -2.3.3.0 or later. It's a build-time requirement. It's also a run-time +2.3.6.1 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.
  • execline version -2.1.1.1 or later. It's a build-time and run-time requirement.
    • +2.1.3.1 or later. It's a build-time and run-time requirement.
  • s6 version -2.1.3.0 or later. It's a build-time and run-time requirement.
    • +2.2.0.1 or later. It's a build-time and run-time requirement.
  • s6-dns version -2.0.0.3 or later. It's a build-time requirement. It's also a run-time +2.0.0.5 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the s6-dns libraries.
    • @@ -65,7 +65,7 @@ libraries.

    Download

    diff --git a/doc/upgrade.html b/doc/upgrade.html index 9e48965..7f4ca87 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,15 @@

    What has changed in s6-networking

    +

    in 2.1.0.2

    + + +

    in 2.1.0.1