From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- .../serdisplib/files/disable-static-build.patch | 84 ++++++++++++++++++++++ dev-libs/serdisplib/files/use-destdir.patch | 84 ++++++++++++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 dev-libs/serdisplib/files/disable-static-build.patch create mode 100644 dev-libs/serdisplib/files/use-destdir.patch (limited to 'dev-libs/serdisplib/files') diff --git a/dev-libs/serdisplib/files/disable-static-build.patch b/dev-libs/serdisplib/files/disable-static-build.patch new file mode 100644 index 000000000000..6364650a8207 --- /dev/null +++ b/dev-libs/serdisplib/files/disable-static-build.patch @@ -0,0 +1,84 @@ +--- a/server/Makefile.in 2018-05-15 21:52:38.966823295 +0200 ++++ b/server/Makefile.in 2018-05-15 21:58:27.137821967 +0200 +@@ -83,13 +83,13 @@ + .c.o: + $(CC) $(CFLAGS) $(DEFINES) -c $(INCLUDES) $< + +-serdispd: $(LIB_DIR)/$(LIB_STATIC) $(SDISPDOBJECTS) ++serdispd: $(LIB_DIR)/$(LIB_SHARED) $(SDISPDOBJECTS) + $(CC) -o $@ $(SDISPDOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) + +-serdisplearn: $(LIB_DIR)/$(LIB_STATIC) $(SLEARNOBJECTS) ++serdisplearn: $(LIB_DIR)/$(LIB_SHARED) $(SLEARNOBJECTS) + $(CC) -o $@ $(SLEARNOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) + +-serdispproxy: $(LIB_DIR)/$(LIB_STATIC) $(SPROXYOBJECTS) ++serdispproxy: $(LIB_DIR)/$(LIB_SHARED) $(SPROXYOBJECTS) + $(CC) -o $@ $(SPROXYOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) + + +--- a/src/Makefile.in 2018-05-15 22:09:10.087118208 +0200 ++++ b/src/Makefile.in 2018-05-15 22:11:22.224117704 +0200 +@@ -167,7 +167,7 @@ + + all: libraries programs + +-libraries: library.static library.shared ++libraries: library.shared + + library.static: $(LIB_DIR)/$(LIB_STATIC) + +@@ -188,7 +188,7 @@ + cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR) + cd $(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so + +-testserdisp: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS) ++testserdisp: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS) + $(CC) -o testserdisp $(OBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) + + clean: +@@ -198,7 +198,7 @@ + distclean: clean + /bin/rm -f Makefile + +-install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC) ++install: $(LIB_DIR)/$(LIB_SHARED) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir) +@@ -206,7 +206,6 @@ + + $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/ +- $(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/ + list='$(LIB_HEADERFILES)'; \ + for headerfile in $$list; do \ + $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \ +--- a/tools/Makefile.in 2018-05-15 21:53:01.042823211 +0200 ++++ b/tools/Makefile.in 2018-05-15 21:59:45.142821669 +0200 +@@ -130,19 +130,19 @@ + .c.o: + $(CC) $(CFLAGS) $(DEFINES) -c $(INCLUDES) $< + +-multidisplay: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS) ++multidisplay: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS) + $(CC) -o multidisplay $(OBJ_MULTIDISPLAY) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) $(EXTRA_LIBS) + +-l4m132c_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS) ++l4m132c_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS) + $(CC) -o l4m132c_tool $(OBJ_L4M132C_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) + +-sdcmegtron_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS) ++sdcmegtron_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS) + $(CC) -o sdcmegtron_tool $(OBJ_SDCMEGTRON_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) + +-l4m320t_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS) +- $(CC) -o l4m320t_tool $(OBJ_L4M320T_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) ++l4m320t_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS) ++ $(CC) -o l4m320t_tool $(OBJ_L4M320T_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) $(EXTRA_LIBS) + +-touchscreen_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS) ++touchscreen_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS) + $(CC) -o touchscreen_tool $(OBJ_TOUCHSCREEN_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) + + clean: diff --git a/dev-libs/serdisplib/files/use-destdir.patch b/dev-libs/serdisplib/files/use-destdir.patch new file mode 100644 index 000000000000..786d475cdd0f --- /dev/null +++ b/dev-libs/serdisplib/files/use-destdir.patch @@ -0,0 +1,84 @@ +--- a/Makefile.in 2017-02-02 13:37:48.000000000 +0100 ++++ b/Makefile.in 2018-05-15 21:52:25.900823345 +0200 +@@ -44,8 +44,8 @@ + done && test -z "$$fail" + + install: +- $(top_srcdir)/mkinstalldirs $(libdir)/pkgconfig +- $(INSTALL_DATA) serdisplib.pc $(libdir)/pkgconfig/ ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig ++ $(INSTALL_DATA) serdisplib.pc $(DESTDIR)$(libdir)/pkgconfig/ + @for dir in ${subdirs}; do \ + (cd $(srcdir) && cd $$dir && $(MAKE) install) \ + || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ +--- a/server/Makefile.in 2013-05-25 12:58:14.000000000 +0200 ++++ b/server/Makefile.in 2018-05-15 21:52:38.966823295 +0200 +@@ -104,18 +104,18 @@ + + + install: $(PROGRAMS) +- $(top_srcdir)/mkinstalldirs $(bindir) +- $(top_srcdir)/mkinstalldirs $(sbindir) +- $(top_srcdir)/mkinstalldirs $(sysconfdir) ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) + list='$(PROGRAMS_SBIN)'; \ + for prog in $$list; do \ +- $(INSTALL_PROGRAM) $$prog $(sbindir)/ ; \ ++ $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(sbindir)/ ; \ + done + list='$(PROGRAMS_BIN)'; \ + for prog in $$list; do \ +- $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \ ++ $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \ + done +- $(INSTALL_DATA) examples/serdispd.cfg $(sysconfdir)/ ++ $(INSTALL_DATA) examples/serdispd.cfg $(DESTDIR)$(sysconfdir)/ + + + uninstall: +--- a/src/Makefile.in 2017-02-02 13:37:48.000000000 +0100 ++++ b/src/Makefile.in 2018-05-15 21:52:56.268823229 +0200 +@@ -199,20 +199,20 @@ + /bin/rm -f Makefile + + install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC) +- $(top_srcdir)/mkinstalldirs $(bindir) +- $(top_srcdir)/mkinstalldirs $(libdir) +- $(top_srcdir)/mkinstalldirs $(includedir) +- $(top_srcdir)/mkinstalldirs $(includedir)/serdisplib ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir) ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/serdisplib + +- $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)/ +- $(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(libdir)/ +- $(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(libdir)/ ++ $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/ ++ $(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/ ++ $(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/ + list='$(LIB_HEADERFILES)'; \ + for headerfile in $$list; do \ +- $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(includedir)/serdisplib/ ; \ ++ $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \ + done +- cd $(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR) +- cd $(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so ++ cd $(DESTDIR)$(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR) ++ cd $(DESTDIR)$(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so + + uninstall: + -/bin/rm -f $(libdir)/libserdisp* +--- a/tools/Makefile.in 2014-03-30 09:13:59.000000000 +0200 ++++ b/tools/Makefile.in 2018-05-15 21:53:01.042823211 +0200 +@@ -155,7 +155,7 @@ + install: $(PROGRAMS) + list='$(PROGRAMS)'; \ + for prog in $$list; do \ +- $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \ ++ $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \ + done + + uninstall: $(PROGRAMS) -- cgit v1.2.3