Hello,
> However, could the patch be revisited not to be applied dynamically during
> the build, but regularly before the build?
Please, find attached a patch to unpack and patch dhcp/bind before the build.
--
Dmitry S. Vasilchenko
Index: package/network/dhcp/dhcp.conf
===================================================================
--- package/network/dhcp/dhcp.conf (revision 37291)
+++ package/network/dhcp/dhcp.conf (working copy)
@@ -16,6 +16,8 @@
prefix=
set_confopt
+hook_add prepatch 5 "tar -C bind -xf bind/bind.tar.gz"
+
premake_dhcp() {
mkdir -p $root${mandir}/ja_JP.eucJP/man5
mkdir -p $root${mandir}/ja_JP.eucJP/man8
Index: package/network/dhcp/dhcp-bind.patch.cross
===================================================================
--- package/network/dhcp/dhcp-bind.patch.cross (revision 37291)
+++ package/network/dhcp/dhcp-bind.patch.cross (working copy)
@@ -14,32 +14,22 @@
# version.
# --- T2-COPYRIGHT-NOTE-END ---
-diff -ruN dhcp-4.2.0/bind/bind.patch dhcp-4.2.0_new/bind/bind.patch
---- dhcp-4.2.0/bind/bind.patch 1970-01-01 03:00:00.000000000 +0300
-+++ dhcp-4.2.0_new/bind/bind.patch 2010-08-11 20:13:55.000000000 +0400
-@@ -0,0 +1,12 @@
-+diff -ruN bind-9.7.1/lib/export/dns/Makefile.in bind-9.7.1_new/lib/export/dns/Makefile.in
-+--- bind-9.7.1/lib/export/dns/Makefile.in 2009-12-06 02:31:40.000000000 +0300
-++++ bind-9.7.1_new/lib/export/dns/Makefile.in 2010-08-11 20:10:57.223160921 +0400
-+@@ -160,7 +160,7 @@
-+ ./gen -s ${srcdir} > code.h
-+
-+ gen: ${srcdir}/gen.c
-+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-++ ${BUILD_CC} ${ALL_CFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
-+
-+ #We don't need rbtdb64 for this library
-+ #rbtdb...@o@: rbtdb.c
+diff -ruN dhcp-4.2.0/bind/bind-9.7.1/lib/export/dns/Makefile.in dhcp-4.2.0_new/bind/bind-9.7.1/lib/export/dns/Makefile.in
+--- dhcp-4.2.0/bind/bind-9.7.1/lib/export/dns/Makefile.in 2009-12-06 02:31:40.000000000 +0300
++++ dhcp-4.2.0_new/bind/bind-9.7.1/lib/export/dns/Makefile.in 2010-08-17 13:04:52.622313241 +0400
+@@ -160,7 +160,7 @@
+ ./gen -s ${srcdir} > code.h
+
+ gen: ${srcdir}/gen.c
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++ ${BUILD_CC} ${ALL_CFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
+
+ #We don't need rbtdb64 for this library
+ #rbtdb...@o@: rbtdb.c
diff -ruN dhcp-4.2.0/bind/Makefile dhcp-4.2.0_new/bind/Makefile
--- dhcp-4.2.0/bind/Makefile 2010-07-10 07:26:52.000000000 +0400
-+++ dhcp-4.2.0_new/bind/Makefile 2010-08-11 19:56:00.712159218 +0400
-@@ -40,12 +40,13 @@
- echo "unable to find gmake" 1>&2 ; \
- exit 1; \
- fi
-+ patch -p0 < bind.patch
-
- # Configure the export libraries
++++ dhcp-4.2.0_new/bind/Makefile 2010-08-17 13:07:19.791270208 +0400
+@@ -45,7 +45,7 @@
# Currently disable the epoll and devpoll options as they don't interact
# well with the DHCP code.
@echo Configuring BIND Export libraries for DHCP.
-----------------------------------------------------------
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2
