diff options
Diffstat (limited to 'meta-networking/recipes-daemons/ippool/ippool_1.3.bb')
-rw-r--r-- | meta-networking/recipes-daemons/ippool/ippool_1.3.bb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 7947ffe457..ede4491309 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb | |||
@@ -42,7 +42,7 @@ inherit systemd | |||
42 | DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" | 42 | DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" |
43 | RDEPENDS:${PN} = "rpcbind" | 43 | RDEPENDS:${PN} = "rpcbind" |
44 | 44 | ||
45 | EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" | 45 | EXTRA_OEMAKE = "CC='${CC} ${CFLAGS}' AS='${AS}' LD='${LD} ${LDFLAGS}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" |
46 | EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" | 46 | EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" |
47 | # enable self tests | 47 | # enable self tests |
48 | EXTRA_OEMAKE += "IPPOOL_TEST=y" | 48 | EXTRA_OEMAKE += "IPPOOL_TEST=y" |
@@ -52,12 +52,7 @@ CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" | |||
52 | SYSTEMD_SERVICE:${PN} = "ippool.service" | 52 | SYSTEMD_SERVICE:${PN} = "ippool.service" |
53 | 53 | ||
54 | do_compile:prepend() { | 54 | do_compile:prepend() { |
55 | # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env | ||
56 | sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile | ||
57 | sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile | ||
58 | |||
59 | sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile | 55 | sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile |
60 | |||
61 | } | 56 | } |
62 | 57 | ||
63 | 58 | ||
@@ -88,7 +83,7 @@ FILES:${PN}-test = "/opt/${BPN}" | |||
88 | # needs tcl to run tests | 83 | # needs tcl to run tests |
89 | RDEPENDS:${PN}-test += "tcl ${BPN}" | 84 | RDEPENDS:${PN}-test += "tcl ${BPN}" |
90 | 85 | ||
91 | PPPD_VERSION="${@get_ppp_version(d)}" | 86 | PPPD_VERSION = "${@get_ppp_version(d)}" |
92 | 87 | ||
93 | def get_ppp_version(d): | 88 | def get_ppp_version(d): |
94 | import re | 89 | import re |