* [gentoo-commits] gentoo-x86 commit in dev-libs/geoip/files: geoip-1.4.4-no-noinst_PROGRAMS.patch geoip-1.4.4-parallel-build.patch
@ 2008-09-24 12:34 Peter Volkov (pva)
0 siblings, 0 replies; only message in thread
From: Peter Volkov (pva) @ 2008-09-24 12:34 UTC (permalink / raw
To: gentoo-commits
pva 08/09/24 12:34:41
Added: geoip-1.4.4-no-noinst_PROGRAMS.patch
geoip-1.4.4-parallel-build.patch
Log:
Version bump. Fixed parallel make failure #180988, thank Mike Doty for report. Do not build test programs, bug #226207, thank Diego Pettenò for report. Remove old.
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 i686)
Revision Changes Path
1.1 dev-libs/geoip/files/geoip-1.4.4-no-noinst_PROGRAMS.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/geoip/files/geoip-1.4.4-no-noinst_PROGRAMS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/geoip/files/geoip-1.4.4-no-noinst_PROGRAMS.patch?rev=1.1&content-type=text/plain
Index: geoip-1.4.4-no-noinst_PROGRAMS.patch
===================================================================
=== modified file 'test/Makefile.am'
--- test/Makefile.am 2008-09-08 09:44:05 +0000
+++ test/Makefile.am 2008-09-08 09:44:14 +0000
@@ -4,56 +4,25 @@
check_PROGRAMS = test-geoip
-#if WITH_CITY
-noinst_PROGRAMS = benchmark test-geoip-region test-geoip-city test-geoip-org test-geoip-asnum test-geoip-isp test-geoip-netspeed
-#else
-#noinst_PROGRAMS = benchmark test-geoip-region
-#endif
+EXTRA_PROGRAMS = benchmark \
+ test-geoip-region \
+ test-geoip-city \
+ test-geoip-org \
+ test-geoip-asnum \
+ test-geoip-isp \
+ test-geoip-netspeed
-DEPS = $(top_builddir)/libGeoIP/libGeoIP.la
-LDADDS = $(top_builddir)/libGeoIP/libGeoIP.la
+LDADD = $(top_builddir)/libGeoIP/libGeoIP.la
test_geoip_SOURCES = test-geoip.c
-test_geoip_LDFLAGS =
-test_geoip_DEPENDENCIES = $(DEPS)
-test_geoip_LDADD = $(LDADDS)
test_geoip_region_SOURCES = test-geoip-region.c
-test_geoip_region_LDFLAGS =
-test_geoip_region_DEPENDENCIES = $(DEPS)
-test_geoip_region_LDADD = $(LDADDS)
-
test_geoip_org_SOURCES = test-geoip-org.c
-test_geoip_org_LDFLAGS =
-test_geoip_org_DEPENDENCIES = $(DEPS)
-test_geoip_org_LDADD = $(LDADDS)
-
test_geoip_isp_SOURCES = test-geoip-isp.c
-test_geoip_isp_LDFLAGS =
-test_geoip_isp_DEPENDENCIES = $(DEPS)
-test_geoip_isp_LDADD = $(LDADDS)
-
test_geoip_asnum_SOURCES = test-geoip-asnum.c
-test_geoip_asnum_LDFLAGS =
-test_geoip_asnum_DEPENDENCIES = $(DEPS)
-test_geoip_asnum_LDADD = $(LDADDS)
-
test_geoip_netspeed_SOURCES = test-geoip-netspeed.c
-test_geoip_netspeed_LDFLAGS =
-test_geoip_netspeed_DEPENDENCIES = $(DEPS)
-test_geoip_netspeed_LDADD = $(LDADDS)
-
-if WITH_CITY
test_geoip_city_SOURCES = test-geoip-city.c
-test_geoip_city_LDFLAGS =
-test_geoip_city_DEPENDENCIES = $(DEPS)
-test_geoip_city_LDADD = $(LDADDS)
-endif
-
benchmark_SOURCES = benchmark.c
-benchmark_LDFLAGS =
-benchmark_DEPENDENCIES = $(DEPS)
-benchmark_LDADD = $(LDADDS)
EXTRA_DIST = country_test.txt country_test2.txt country_test_name.txt region_test.txt
TESTS = test-geoip
1.1 dev-libs/geoip/files/geoip-1.4.4-parallel-build.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/geoip/files/geoip-1.4.4-parallel-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/geoip/files/geoip-1.4.4-parallel-build.patch?rev=1.1&content-type=text/plain
Index: geoip-1.4.4-parallel-build.patch
===================================================================
Source: Peter Volkov <pva@gentoo.org>
Upstream: Notified
Reason: parallel make failed.
From automake info page:
When writing `install-exec-hook' or `install-data-hook', please bear in mind
that the exec/data distinction is based on the installation directory, not
on the primary used (*note Install::). So a `foo_SCRIPTS' will be installed
by `install-data', and a `barexec_SCRIPTS' will be installed by
`install-exec'. You should define your hooks consequently.
Variables using the standard directory prefixes `bin', `sbin', `libexec',
`sysconf', `localstate', `lib', or `pkglib' are installed by `install-exec'.
thus change from install-data-hook to install-exec-hook.
Automake also supports two install hooks, `install-exec-hook' and
`install-data-hook'. These hooks are run after all other install rules of
the appropriate type, exec or data, have completed. So, for instance, it is
possible to perform post-installation modifications using an install hook.
thus no need for dependencies.
--- conf/Makefile.am 2008-09-02 14:26:04 +0000
+++ conf/Makefile.am 2008-09-02 17:18:02 +0000
@@ -4,7 +4,7 @@
DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
-install-data-hook: install-sysconfDATA
+install-exec-hook:
@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
else \
--- data/Makefile.am 2008-09-02 14:26:04 +0000
+++ data/Makefile.am 2008-09-02 17:19:00 +0000
@@ -4,7 +4,7 @@
DEFAULT_DB_FILE = $(pkgdatadir)/GeoIP.dat
-install-data-hook: install-pkgdataDATA
+install-data-hook:
@if test -f $(DESTDIR)$(DEFAULT_DB_FILE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_DB_FILE)" ; \
else \
--- man/Makefile.am 2008-09-02 14:26:04 +0000
+++ man/Makefile.am 2008-09-02 17:19:06 +0000
@@ -5,6 +5,6 @@
UPDATE_MAN = $(mandir)/man1/geoipupdate.1
LOOKUP_MAN = $(mandir)/man1/geoiplookup.1
-install-data-hook: install-man
+install-data-hook:
cat geoipupdate.1 | sed s,DATADIR,$(pkgdatadir), | sed s,CONF_DIR,$(sysconfdir), > $(DESTDIR)$(UPDATE_MAN)
cat geoiplookup.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP_MAN)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-09-24 12:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-24 12:34 [gentoo-commits] gentoo-x86 commit in dev-libs/geoip/files: geoip-1.4.4-no-noinst_PROGRAMS.patch geoip-1.4.4-parallel-build.patch Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox