diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-06 10:25:36 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-06 10:25:36 +0200 |
| commit | 5f875caf9e31730faff78cfa1fc99c30717a924d (patch) | |
| tree | 64da821f3be8e6f7a61a55ae2aa3d7de5ad33e89 /multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch | |
| parent | a791587b609550b73cd867a642338769dc7c117d (diff) | |
| parent | d9c1fc1bcca8fd5cd3566fc6b183fe23065778bc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/rsyslog/PKGBUILD
extra/boost/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdegames/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
libre/kdenetwork-libre/PKGBUILD
multilib/lib32-expat/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-openal/PKGBUILD
multilib/lib32-p11-kit/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
testing/pcmciautils/PKGBUILD
testing/systemd/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch')
| -rw-r--r-- | multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch deleted file mode 100644 index d28237f85..000000000 --- a/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/timezone/Makefile b/timezone/Makefile -index 00bfba6..9e55a6a 100644 ---- a/timezone/Makefile -+++ b/timezone/Makefile -@@ -45,7 +45,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. - CPPFLAGS-zic = -DNOT_IN_libc - - ifeq ($(have-ksh),yes) --install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab - install-bin-script = tzselect - generated += tzselect - endif -@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make - -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new - chmod 555 $@.new - mv -f $@.new $@ -- --$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \ -- $(inst_zonedir)/%: % $(+force) -- $(do-install) |