* [meta-oe][PATCH 2/6] ckermit: Update recipe ckermit_301.bb -> ckermit_302.bb
2014-09-04 7:32 [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20 Khem Raj
@ 2014-09-04 7:32 ` Khem Raj
2014-09-04 7:32 ` [meta-oe][PATCH 3/6] luajit, acpitests: Fix build on hardfloat arm Khem Raj
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2014-09-04 7:32 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/ckermit/ckermit_301.bb | 57 -------------------------
meta-oe/recipes-support/ckermit/ckermit_302.bb | 58 ++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 57 deletions(-)
delete mode 100644 meta-oe/recipes-support/ckermit/ckermit_301.bb
create mode 100644 meta-oe/recipes-support/ckermit/ckermit_302.bb
diff --git a/meta-oe/recipes-support/ckermit/ckermit_301.bb b/meta-oe/recipes-support/ckermit/ckermit_301.bb
deleted file mode 100644
index b255f5e..0000000
--- a/meta-oe/recipes-support/ckermit/ckermit_301.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "C-Kermit is a combined serial and network communication \
-software package offering a consistent, medium-independent, \
-cross-platform approach to connection establishment, terminal \
-sessions, file transfer, character-set translation, and automation \
-of communication tasks."
-HOMEPAGE = "http://www.columbia.edu/kermit/"
-SECTION = "console/network"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=932ca542d6c6cb8a59a0bcd76ab67cc3"
-SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}"
-
-export CC2 = "${CC}"
-export BINDIR = "${bindir}"
-export MANDIR = "${mandir}/man1"
-export INFODIR = "${infodir}"
-
-# Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit
-# trying to look inside the stdio headers.
-CKERMIT_ADDITIONAL = ""
-CKERMIT_ADDITIONAL_libc-uclibc = "-DNOARROWKEYS"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_compile () {
- # The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
- # so we build wart manually. Note that you need a ckwart.o with the proper
- # timestamp to make this hack work:
- ${BUILD_CC} -c ckwart.c
- ${BUILD_CC} -o wart ckwart.o
- ./wart ckcpro.w ckcpro.c
-
- # read ${S}/ckccfg.txt to understand this :-)
- oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \
- -DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \
- -DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \
- -DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \
- -DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \
- -DNOB_460K -DNOB_921K \
- -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \
- -DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \
- -DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \
- -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
- -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
- -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \
- ${CKERMIT_ADDITIONAL}"
-}
-
-do_install () {
- install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR}
- oe_runmake 'DESTDIR=${D}' install
- # Fix up dangling symlink
- rm ${D}${BINDIR}/kermit-sshsub
- (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb)
-}
-
-SRC_URI[md5sum] = "59e80f909edf305933af8e0348dcc5d7"
-SRC_URI[sha256sum] = "9793eb125f8936b079c6d7e5c3d2ff885cfedc07f9d2dd1e7db928e3029a211a"
diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb
new file mode 100644
index 0000000..32a6c03
--- /dev/null
+++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "C-Kermit is a combined serial and network communication \
+software package offering a consistent, medium-independent, \
+cross-platform approach to connection establishment, terminal \
+sessions, file transfer, character-set translation, and automation \
+of communication tasks."
+HOMEPAGE = "http://www.columbia.edu/kermit/"
+SECTION = "console/network"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=932ca542d6c6cb8a59a0bcd76ab67cc3"
+
+SRC_URI = "ftp://ftp.kermitproject.org/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}"
+SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0"
+SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711"
+
+
+export CC2 = "${CC}"
+export BINDIR = "${bindir}"
+export MANDIR = "${mandir}/man1"
+export INFODIR = "${infodir}"
+
+# Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit
+# trying to look inside the stdio headers.
+CKERMIT_ADDITIONAL = ""
+CKERMIT_ADDITIONAL_libc-uclibc = "-DNOARROWKEYS"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_compile () {
+ # The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
+ # so we build wart manually. Note that you need a ckwart.o with the proper
+ # timestamp to make this hack work:
+ ${BUILD_CC} -c ckwart.c
+ ${BUILD_CC} -o wart ckwart.o
+ ./wart ckcpro.w ckcpro.c
+
+ # read ${S}/ckccfg.txt to understand this :-)
+ oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \
+ -DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \
+ -DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \
+ -DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \
+ -DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \
+ -DNOB_460K -DNOB_921K \
+ -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \
+ -DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \
+ -DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \
+ -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
+ -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
+ -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \
+ ${CKERMIT_ADDITIONAL}"
+}
+
+do_install () {
+ install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR}
+ oe_runmake 'DESTDIR=${D}' install
+ # Fix up dangling symlink
+ rm ${D}${BINDIR}/kermit-sshsub
+ (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb)
+}
--
2.1.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-oe][PATCH 3/6] luajit, acpitests: Fix build on hardfloat arm
2014-09-04 7:32 [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20 Khem Raj
2014-09-04 7:32 ` [meta-oe][PATCH 2/6] ckermit: Update recipe ckermit_301.bb -> ckermit_302.bb Khem Raj
@ 2014-09-04 7:32 ` Khem Raj
2014-09-04 7:32 ` [meta-oe][PATCH 4/6] Fix build with glibc 2.20 Khem Raj
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2014-09-04 7:32 UTC (permalink / raw)
To: openembedded-devel
luajit as well as acpitests build system has mind of its own and does not
respect CC and friends in makefiles so we have to inject
the CFLAGS via EXTRA_OEMAKE, some of ABI defining params
e.g. float-abi selection is mentioned in TUNE_CCARGS and
not in TOOLCHAIN_OPTIONS. This causes build to go for softfloat
build and that is not what we want.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb | 5 ++++-
meta-oe/recipes-extended/acpica/acpitests_20140424.bb | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
index 684ec14..48137e3 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
@@ -20,7 +20,10 @@ do_configure_prepend() {
sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile
}
-EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} TARGET_CFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"'
+EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \
+ TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \
+ TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \
+ TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"'
EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"'
EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"'
EXTRA_OEMAKE_append_i586 = ' HOST_CC="${BUILD_CC} -m32"'
diff --git a/meta-oe/recipes-extended/acpica/acpitests_20140424.bb b/meta-oe/recipes-extended/acpica/acpitests_20140424.bb
index 7e145bb..e3c706c 100644
--- a/meta-oe/recipes-extended/acpica/acpitests_20140424.bb
+++ b/meta-oe/recipes-extended/acpica/acpitests_20140424.bb
@@ -18,7 +18,7 @@ SRC_URI[acpica.sha256sum] = "72ece982bbbdfb1b17418f1feb3a9daaa01803d0d41dcf00e19
S = "${WORKDIR}/acpitests-unix-${PV}"
-EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc 'OPT_CFLAGS=-Wall'"
+EXTRA_OEMAKE = "'CC=${TARGET_PREFIX}gcc ${HOST_CC_ARCH}' 'OPT_CFLAGS=-Wall'"
# The Makefiles expect a specific layout
do_compile() {
--
2.1.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-oe][PATCH 4/6] Fix build with glibc 2.20
2014-09-04 7:32 [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20 Khem Raj
2014-09-04 7:32 ` [meta-oe][PATCH 2/6] ckermit: Update recipe ckermit_301.bb -> ckermit_302.bb Khem Raj
2014-09-04 7:32 ` [meta-oe][PATCH 3/6] luajit, acpitests: Fix build on hardfloat arm Khem Raj
@ 2014-09-04 7:32 ` Khem Raj
2014-09-04 7:32 ` [meta-networking][PATCH 5/6] lowpan-tools: Move to 0.3.1 release Khem Raj
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2014-09-04 7:32 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../libmtp/libmtp-1.1.5/glibc-2.20.patch | 36 ++++++++++++++++++++++
.../recipes-connectivity/libmtp/libmtp_1.1.5.bb | 1 +
2 files changed, 37 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch b/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch
new file mode 100644
index 0000000..38b45c2
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch
@@ -0,0 +1,36 @@
+
+Include config.h so we get the defines available for subsequent
+include files
+
+Fixes errors like
+
+| In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/beaglebone/usr/include/string.h:634:0,
+| from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/cortexa8t2hf-vfp-neon-oe-linux-gnueabi/libmtp/1.1.5-r0/libmtp-1.1.5/src/util.c:36:
+| /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/cortexa8t2hf-vfp-neon-oe-linux-gnueabi/libmtp/1.1.5-r0/libmtp-1.1.5/src/util.h:29:7: error: expected identifier or '(' before '__extension
+__'
+| char *strndup (const char *s, size_t n);
+| ^
+| /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/cortexa8t2hf-vfp-neon-oe-linux-gnueabi/libmtp/1.1.5-r0/libmtp-1.1.5/src/util.c:111:7: error: expected identifier or '(' before '__extensio
+n__'
+| char *strndup (const char *s, size_t n)
+| ^
+| make[2]: *** [libmtp_la-util.lo] Error 1
+
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: libmtp-1.1.5/src/util.c
+===================================================================
+--- libmtp-1.1.5.orig/src/util.c 2011-01-10 05:37:21.000000000 -0800
++++ libmtp-1.1.5/src/util.c 2014-09-03 23:50:44.703563888 -0700
+@@ -22,6 +22,8 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#include "config.h"
++
+ /* MSVC does not have these */
+ #ifndef _MSC_VER
+ #include <sys/time.h>
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
index 004323a..de63c72 100644
--- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
@@ -19,6 +19,7 @@ SCM_URI = "git://git.code.sf.net/p/libmtp/code"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
file://69-libmtp.rules \
+ file://glibc-2.20.patch \
"
SRC_URI[md5sum] = "f80e45c0e6e5798c434bb1c26a7b602d"
SRC_URI[sha256sum] = "787679171baf8b3cf2fcc03196c705ab4d7cbc969bd71f9d3696be1ce7f1c63a"
--
2.1.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-networking][PATCH 5/6] lowpan-tools: Move to 0.3.1 release
2014-09-04 7:32 [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20 Khem Raj
` (2 preceding siblings ...)
2014-09-04 7:32 ` [meta-oe][PATCH 4/6] Fix build with glibc 2.20 Khem Raj
@ 2014-09-04 7:32 ` Khem Raj
2014-09-09 13:17 ` Joe MacDonald
2014-09-04 7:32 ` [meta-oe][PATCH 6/6] numlockx: Update SRC_URI to somewhere fetchable Khem Raj
2014-09-09 13:08 ` [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20 Joe MacDonald
5 siblings, 1 reply; 8+ messages in thread
From: Khem Raj @ 2014-09-04 7:32 UTC (permalink / raw)
To: openembedded-devel
Also fix the git SRC_URI location
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
index d8e1ddb..ca10262 100644
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
+++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libnl python"
-PV = "0.3+git${SRCPV}"
-SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee \
+PV = "0.3.1+git${SRCPV}"
+SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \
file://no-help2man.patch"
-SRCREV = "a1d9615adde6d1a568813c24a128273ed755af04"
+SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733"
S = "${WORKDIR}/git"
--
2.1.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [meta-networking][PATCH 5/6] lowpan-tools: Move to 0.3.1 release
2014-09-04 7:32 ` [meta-networking][PATCH 5/6] lowpan-tools: Move to 0.3.1 release Khem Raj
@ 2014-09-09 13:17 ` Joe MacDonald
0 siblings, 0 replies; 8+ messages in thread
From: Joe MacDonald @ 2014-09-09 13:17 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]
Also merged, thanks.
-J.
[[oe] [meta-networking][PATCH 5/6] lowpan-tools: Move to 0.3.1 release] On 14.09.04 (Thu 00:32) Khem Raj wrote:
> Also fix the git SRC_URI location
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
> index d8e1ddb..ca10262 100644
> --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
> +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
> @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>
> DEPENDS = "libnl python"
>
> -PV = "0.3+git${SRCPV}"
> -SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee \
> +PV = "0.3.1+git${SRCPV}"
> +SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \
> file://no-help2man.patch"
> -SRCREV = "a1d9615adde6d1a568813c24a128273ed755af04"
> +SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733"
>
> S = "${WORKDIR}/git"
>
> --
> 2.1.0
>
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [meta-oe][PATCH 6/6] numlockx: Update SRC_URI to somewhere fetchable
2014-09-04 7:32 [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20 Khem Raj
` (3 preceding siblings ...)
2014-09-04 7:32 ` [meta-networking][PATCH 5/6] lowpan-tools: Move to 0.3.1 release Khem Raj
@ 2014-09-04 7:32 ` Khem Raj
2014-09-09 13:08 ` [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20 Joe MacDonald
5 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2014-09-04 7:32 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb b/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
index ec875f0..47ec504 100644
--- a/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
+++ b/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT-X"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dcb1cc75e21540a4a66b54e38d95b047"
DEPENDS = "virtual/libx11 libxtst"
-SRC_URI = "http://home.kde.org/~seli/numlockx/numlockx-${PV}.tar.gz"
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/numlockx/numlockx-${PV}.tar.gz/be9109370447eae23f6f3f8527bb1a67/numlockx-${PV}.tar.gz"
SRC_URI[md5sum] = "be9109370447eae23f6f3f8527bb1a67"
SRC_URI[sha256sum] = "e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4"
--
2.1.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20
2014-09-04 7:32 [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20 Khem Raj
` (4 preceding siblings ...)
2014-09-04 7:32 ` [meta-oe][PATCH 6/6] numlockx: Update SRC_URI to somewhere fetchable Khem Raj
@ 2014-09-09 13:08 ` Joe MacDonald
5 siblings, 0 replies; 8+ messages in thread
From: Joe MacDonald @ 2014-09-09 13:08 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2610 bytes --]
Merged, thanks.
-J.
[[oe] [meta-networking][PATCH 1/6] ipsec-tools: Fix build with glibc 2.20] On 14.09.04 (Thu 00:32) Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../ipsec-tools/ipsec-tools/glibc-2.20.patch | 23 ++++++++++++++++++++++
> .../ipsec-tools/ipsec-tools_0.8.2.bb | 1 +
> 2 files changed, 24 insertions(+)
> create mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch
>
> diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch
> new file mode 100644
> index 0000000..36efc49
> --- /dev/null
> +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch
> @@ -0,0 +1,23 @@
> +squahes below warning
> + warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
> +
> +Seen with glibc 2.20
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +Upstream-Status: Pending
> +Index: ipsec-tools-0.8.2/src/include-glibc/glibc-bugs.h
> +===================================================================
> +--- ipsec-tools-0.8.2.orig/src/include-glibc/glibc-bugs.h 2006-09-09 09:22:08.000000000 -0700
> ++++ ipsec-tools-0.8.2/src/include-glibc/glibc-bugs.h 2014-09-03 22:27:22.551563888 -0700
> +@@ -4,7 +4,11 @@
> + #define __GLIBC_BUGS_H__ 1
> +
> + #define _XOPEN_SOURCE 500
> ++/* Legacy feature macro.*/
> + #define _BSD_SOURCE
> ++/* New feature macro that provides everything _BSD_SOURCE and
> ++ * _SVID_SOURCE provided and possibly more. */
> ++#define _DEFAULT_SOURCE
> +
> + #include <features.h>
> + #include <sys/types.h>
> diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
> index 208268f..babce40 100644
> --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
> +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
> @@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV
> file://0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch \
> file://racoon-check-invalid-pointers.patch \
> file://racoon-check-invalid-ivm.patch \
> + file://glibc-2.20.patch \
> "
> SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41"
> SRC_URI[sha256sum] = "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d"
> --
> 2.1.0
>
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread