diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-09-17 12:24:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-09-17 12:24:34 +0200 |
| commit | 95444b27abfb723db6c66c08dc6c12c7e1128e2e (patch) | |
| tree | c9acdec9f7f8cb7e22caad371c77834c389655c0 /package/dhcp | |
| parent | 79d5a4a7dc9648e2d55407ca11daa9a4342abe72 (diff) | |
remove -fhonour-copts usage
This reuires a external gcc patch, which I no longer add to newer gcc.
A lot of packages already need to disable the usage of -fhonour-copts, because
it doesn't work without patching. May be we need something like Buildroot
is using, a gcc wrapper to see poisened include or library paths while
cross-compiling.
Diffstat (limited to 'package/dhcp')
| -rw-r--r-- | package/dhcp/Makefile | 3 | ||||
| -rw-r--r-- | package/dhcp/patches/patch-bind_Makefile_in | 41 |
2 files changed, 1 insertions, 43 deletions
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index b777ef252..d86e13725 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -23,8 +23,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DHCP_RELAY},${PKG_SECTION})) -MAKE_ENV+= GCC_HONOUR_COPTS=s \ - BUILD_CC="$(HOST_CC)" \ +MAKE_ENV+= BUILD_CC="$(HOST_CC)" \ BUILD_CFLAGS="$(HOST_CFLAGS)" \ BUILD_CPPFLAGS="$(HOST_CPPFLAGS)" \ BUILD_LDFLAGS="$(HOST_LDFLAGS)" diff --git a/package/dhcp/patches/patch-bind_Makefile_in b/package/dhcp/patches/patch-bind_Makefile_in index c6ffe3f33..8f686ec26 100644 --- a/package/dhcp/patches/patch-bind_Makefile_in +++ b/package/dhcp/patches/patch-bind_Makefile_in @@ -11,44 +11,3 @@ @BIND_ATF_FALSE@cleandirs = ./lib ./include @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf -@@ -64,7 +66,7 @@ bind1: - echo Configuring BIND Export libraries for DHCP. ; \ - rm -rf ${cleandirs} ${cleanfiles} ; \ - (cd ${bindsrcdir} && \ -- ./configure ${bindconfig} > ${binddir}/configure.log); \ -+ GCC_HONOUR_COPTS=s ./configure ${bindconfig}) ; \ - fi - - atf: -@@ -90,11 +92,11 @@ bind2-noguest: - echo Building BIND Export libraries - this takes some time. ;\ - (cd ${bindsrcdir}/lib/export ; \ - echo building in `pwd` ; \ -- MAKE=${GMAKE} ${GMAKE} >> ${binddir}/build.log) ; \ -+ GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} ) ; \ - \ - echo Installing BIND Export libraries to ${binddir}. ; \ - (cd ${bindsrcdir}/lib/export ; \ -- MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \ -+ GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} install ) ; \ - fi - - bind2-hostgen: -@@ -106,14 +108,14 @@ bind2-hostgen: - echo Building BIND Export libraries - this takes some time. ;\ - (cd ${bindsrcdir}/lib/export/dns ; \ - echo building gen using ${BUILD_CC} in `pwd` ; \ -- MAKE=${GMAKE} ${GMAKE} CC=${BUILD_CC} CFLAGS=${BUILD_CFLAGS} CPPFLAGS=${BUILD_CPPFLAGS} LDFLAGS=${BUILD_LDFLAGS} LIBS=${BUILD_LIBS} gen >> ${binddir}/build.log) ; \ -+ GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} CC=${BUILD_CC} CFLAGS=${BUILD_CFLAGS} CPPFLAGS=${BUILD_CPPFLAGS} LDFLAGS=${BUILD_LDFLAGS} LIBS=${BUILD_LIBS} gen ) ; \ - (cd ${bindsrcdir}/lib/export ; \ - echo building in `pwd` ; \ -- MAKE=${GMAKE} ${GMAKE} >> ${binddir}/build.log) ; \ -+ GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} ) ; \ - \ - echo Installing BIND Export libraries to ${binddir}. ; \ - (cd ${bindsrcdir}/lib/export ; \ -- MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \ -+ GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} install ) ; \ - fi - - clean: |