summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/01_remove-data-prerequisites.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/patches/01_remove-data-prerequisites.patch b/patches/01_remove-data-prerequisites.patch
new file mode 100644
index 0000000..ff41e05
--- /dev/null
+++ b/patches/01_remove-data-prerequisites.patch
@@ -0,0 +1,64 @@
+From: "P. J. McDermott" <pjm@nac.net>
+Subject: Makefile: Remove data prerequisites
+
+The tz makefile is shared between tzdata and tzcode, and the tzcode program
+targets depend on files only packed into tzdata.
+
+Before:
+
+ oh-autobuild
+ make[1]: Entering directory `/home/pj/distro/pkg/tzcode/tmp/src'
+ sed \
+ -e 's|#!/bin/bash|#!/bin/bash|g' \
+ -e 's|AWK=[^}]*|AWK=awk|g' \
+ -e 's|\(PKGVERSION\)=.*|\1='\''(tzcode) '\''|' \
+ -e 's|\(REPORT_BUGS_TO\)=.*|\1=tz@iana.org|' \
+ -e 's|TZDIR=[^}]*|TZDIR=/usr/local/etc/zoneinfo|' \
+ -e 's|\(TZVERSION\)=.*|\1=2013g|' \
+ <tzselect.ksh >tzselect
+ chmod +x tzselect
+ (echo 'static char const PKGVERSION[]="(tzcode) ";' && \
+ echo 'static char const TZVERSION[]="2013g";' && \
+ echo 'static char const REPORT_BUGS_TO[]="tz@iana.org";') >version.h
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -c -o zic.o zic.c
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -c -o localtime.o localtime.c
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -c -o asctime.o asctime.c
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -c -o scheck.o scheck.c
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -c -o ialloc.o ialloc.c
+ make[1]: *** No rule to make target `yearistype.sh', needed by `yearistype'. Stop.
+ make[1]: Leaving directory `/home/pj/distro/pkg/tzcode/tmp/src'
+ make: *** [build] Error 2
+
+With yearistype prerequisite removed:
+
+ oh-autobuild
+ make[1]: Entering directory `/home/pj/distro/pkg/tzcode/tmp/src'
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -o zic zic.o localtime.o asctime.o scheck.o ialloc.o
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -c -o zdump.o zdump.c
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -o zdump zdump.o localtime.o ialloc.o asctime.c
+ cc -DTZDIR=\"/usr/local/etc/zoneinfo\" -c -o difftime.o difftime.c
+ make[1]: *** No rule to make target `iso3166.tab', needed by `all'. Stop.
+ make[1]: Leaving directory `/home/pj/distro/pkg/tzcode/tmp/src'
+ make: *** [build] Error 2
+
+diff -Naur src.orig/Makefile src/Makefile
+--- src.orig/Makefile 2013-10-01 00:10:49.000000000 -0400
++++ src/Makefile 2013-10-06 14:56:07.557822960 -0400
+@@ -340,7 +340,7 @@
+
+ SHELL= /bin/sh
+
+-all: tzselect zic zdump $(LIBOBJS) $(TABDATA)
++all: tzselect zic zdump $(LIBOBJS)
+
+ ALL: all date
+
+@@ -381,7 +381,7 @@
+ zdump: $(TZDOBJS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
+
+-zic: $(TZCOBJS) yearistype
++zic: $(TZCOBJS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
+
+ yearistype: yearistype.sh