diff options
Diffstat (limited to 'devel/glib20/files/patch-ab')
| -rw-r--r-- | devel/glib20/files/patch-ab | 117 |
1 files changed, 22 insertions, 95 deletions
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab index 6d81325c0f4f..ce0e92a107d6 100644 --- a/devel/glib20/files/patch-ab +++ b/devel/glib20/files/patch-ab @@ -1,6 +1,6 @@ --- Makefile.in.orig Mon Jan 18 07:30:09 1999 -+++ Makefile.in Thu Jan 21 04:27:54 1999 -@@ -89,14 +89,12 @@ ++++ Makefile.in Fri Jan 22 02:53:32 1999 +@@ -89,14 +89,14 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ @@ -10,7 +10,8 @@ #SUBDIRS = . gmodule gthread docs tests -configincludedir = $(pkglibdir)/include -- ++configincludedir = $(includedir) + -bin_SCRIPTS=glib-config -BUILT_SOURCES=glib-config +bin_SCRIPTS=glib11d-config @@ -18,7 +19,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -@@ -111,9 +109,9 @@ +@@ -111,9 +111,9 @@ makefile.msc \ glibconfig.h.win32 @@ -30,15 +31,7 @@ garray.c \ gcache.c \ gcompletion.c \ -@@ -141,28 +139,25 @@ - gutils.c - - include_HEADERS = \ -- glib.h -- --configinclude_DATA = \ -+ glib.h \ - glibconfig.h +@@ -148,21 +148,20 @@ BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h @@ -66,7 +59,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -170,8 +165,8 @@ +@@ -170,8 +169,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -77,7 +70,7 @@ gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \ gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \ gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \ -@@ -180,15 +175,15 @@ +@@ -180,15 +179,15 @@ testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o @@ -96,16 +89,7 @@ testgdateparser_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) -@@ -196,7 +191,7 @@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ --DATA = $(configinclude_DATA) $(m4data_DATA) -+DATA = $(m4data_DATA) - - HEADERS = $(include_HEADERS) - -@@ -210,8 +205,8 @@ +@@ -210,8 +209,8 @@ TAR = tar GZIP = --best @@ -116,7 +100,7 @@ all: all-recursive-am all-am -@@ -252,7 +247,10 @@ +@@ -252,7 +251,10 @@ -rm -f config.h maintainer-clean-hdr: @@ -128,7 +112,7 @@ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status mostlyclean-libLTLIBRARIES: -@@ -318,8 +316,8 @@ +@@ -318,8 +320,8 @@ maintainer-clean-libtool: @@ -139,80 +123,17 @@ mostlyclean-noinstPROGRAMS: -@@ -361,44 +359,6 @@ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - done - --install-configincludeDATA: $(configinclude_DATA) -- @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(configincludedir) -- @list='$(configinclude_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p; \ -- fi; fi; \ -- done -- --uninstall-configincludeDATA: -- @$(NORMAL_UNINSTALL) -- list='$(configinclude_DATA)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(configincludedir)/$$p; \ -- done -- --install-m4dataDATA: $(m4data_DATA) -- @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(m4datadir) -- @list='$(m4data_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \ -- fi; fi; \ -- done -- --uninstall-m4dataDATA: -- @$(NORMAL_UNINSTALL) -- list='$(m4data_DATA)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(m4datadir)/$$p; \ -- done -- - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) -@@ -538,13 +498,13 @@ +@@ -538,7 +540,7 @@ all-recursive-am: config.h $(MAKE) all-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) config.h -+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) config.h ++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) config.h install-exec-am: install-libLTLIBRARIES install-binSCRIPTS --install-data-am: install-configincludeDATA install-m4dataDATA install-includeHEADERS -+install-data-am: install-includeHEADERS - --uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS -+uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-includeHEADERS - - install-exec: install-exec-recursive install-exec-am - @$(NORMAL_INSTALL) -@@ -620,8 +580,7 @@ - maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ - distclean-noinstPROGRAMS clean-noinstPROGRAMS \ - maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ --uninstall-configincludeDATA install-configincludeDATA \ --uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \ -+uninstall-includeHEADERS \ - install-includeHEADERS install-data-recursive uninstall-data-recursive \ - install-exec-recursive uninstall-exec-recursive installdirs-recursive \ - uninstalldirs-recursive all-recursive check-recursive \ --- gmodule/Makefile.in.orig Mon Jan 18 07:30:13 1999 -+++ gmodule/Makefile.in Thu Jan 21 04:27:34 1999 ++++ gmodule/Makefile.in Fri Jan 22 02:55:56 1999 @@ -103,30 +103,29 @@ include_HEADERS = \ gmodule.h @@ -258,7 +179,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gmoduleconf.h -@@ -137,17 +136,17 @@ +@@ -137,22 +136,22 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -283,6 +204,12 @@ testgmodule_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --mode=link $(CC) -export-dynamic $(CFLAGS) $(LDFLAGS) -o $@ + HEADERS = $(include_HEADERS) + + DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in \ @@ -163,10 +162,10 @@ TAR = tar @@ -332,7 +259,7 @@ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ --- gthread/Makefile.in.orig Mon Jan 18 07:30:16 1999 -+++ gthread/Makefile.in Thu Jan 21 04:27:34 1999 ++++ gthread/Makefile.in Fri Jan 22 02:46:01 1999 @@ -95,19 +95,18 @@ gthread-nspr.c \ gthread-none.c |