* [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri
@ 2017-03-20 5:31 Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH V2 02/16] rapidjson: Update to 1.1.0 + git Khem Raj
` (14 more replies)
0 siblings, 15 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Additional patches are upstream to fix build with gcc6 and clang
Add systemd unit file
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 -
.../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 ---------------------
meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 +
.../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0
.../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +-
.../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0
meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 ----
meta-oe/recipes-support/gpm/gpm_git.bb | 43 +++
8 files changed, 53 insertions(+), 392 deletions(-)
delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch
delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch
create mode 100644 meta-oe/recipes-support/gpm/gpm/gpm.service.in
rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/init (100%)
rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/no-docs.patch (93%)
rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/processcreds.patch (100%)
delete mode 100644 meta-oe/recipes-support/gpm/gpm_1.99.7.bb
create mode 100644 meta-oe/recipes-support/gpm/gpm_git.bb
diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch
deleted file mode 100644
index e43bdcb22..000000000
--- a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Upstream-Status: pending
-
---- gpm-1.99.7.orig/src/daemon/open_console.c 2008-07-24 12:33:05.000000000 +0200
-+++ gpm-1.99.7/src/daemon/open_console.c 2013-01-10 12:39:47.975461947 +0100
-@@ -23,6 +23,7 @@
- #include <fcntl.h> /* open and co. */
- #include <sys/stat.h> /* stat() */
- #include <sys/ioctl.h> /* ioctl() */
-+#include <sys/types.h> /* major() */
-
- /* Linux specific (to be outsourced in gpm2 */
- #include <linux/serial.h> /* for serial console check */
diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch
deleted file mode 100644
index d2d6cb8a8..000000000
--- a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-Remove nested functions, they are not available in all compilers
-e.g. clang will not support them.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: gpm-1.99.7/src/drivers/summa/i.c
-===================================================================
---- gpm-1.99.7.orig/src/drivers/summa/i.c
-+++ gpm-1.99.7/src/drivers/summa/i.c
-@@ -36,6 +36,28 @@ extern int summamaxy;
-
- extern signed char summaid;
-
-+static void resetsumma(int fd)
-+{
-+ write(fd, 0, 1); /* Reset */
-+ usleep(400000); /* wait */
-+}
-+
-+static int waitsumma(int fd)
-+{
-+ struct timeval timeout;
-+
-+ fd_set readfds;
-+
-+ int err;
-+
-+ FD_ZERO(&readfds);
-+ FD_SET(fd, &readfds);
-+ timeout.tv_sec = 0;
-+ timeout.tv_usec = 200000;
-+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout);
-+ return (err);
-+}
-+
- Gpm_Type *I_summa(int fd, unsigned short flags, struct Gpm_Type *type, int argc,
- char **argv)
- {
-@@ -43,24 +65,6 @@ Gpm_Type *I_summa(int fd, unsigned short
- flags = argc = 0; /* FIXME: 1.99.13 */
- argv = NULL;
-
-- void resetsumma() {
-- write(fd, 0, 1); /* Reset */
-- usleep(400000); /* wait */
-- }
-- int waitsumma() {
-- struct timeval timeout;
--
-- fd_set readfds;
--
-- int err;
--
-- FD_ZERO(&readfds);
-- FD_SET(fd, &readfds);
-- timeout.tv_sec = 0;
-- timeout.tv_usec = 200000;
-- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout);
-- return (err);
-- }
- int err;
-
- char buffer[255];
-@@ -91,7 +95,7 @@ Gpm_Type *I_summa(int fd, unsigned short
- */
- setspeed(fd, 1200, 9600, 1,
- B9600 | CS8 | CREAD | CLOCAL | HUPCL | PARENB | PARODD);
-- resetsumma();
-+ resetsumma(fd);
-
- write(fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE));
-
-@@ -103,7 +107,7 @@ Gpm_Type *I_summa(int fd, unsigned short
- * read the Summa Firm-ID
- */
- write(fd, SS_FIRMID, strlen(SS_FIRMID));
-- err = waitsumma();
-+ err = waitsumma(fd);
- if(!((err == -1) || (!err))) {
- summaid = 10; /* Original Summagraphics */
- read(fd, buffer, 255); /* Read Firm-ID */
-@@ -111,14 +115,14 @@ Gpm_Type *I_summa(int fd, unsigned short
- }
-
- if(summaid < 0) { /* Genius-test */
-- resetsumma();
-+ resetsumma(fd);
- write(fd, GEN_MMSERIES, 1);
- write(fd, &GEN_MODELL, 1); /* Read modell */
-- err = waitsumma();
-+ err = waitsumma(fd);
- if(!((err == -1) || (!err))) { /* read Genius-ID */
-- err = waitsumma();
-+ err = waitsumma(fd);
- if(!((err == -1) || (!err))) {
-- err = waitsumma();
-+ err = waitsumma(fd);
- if(!((err == -1) || (!err))) {
- read(fd, &config, 1);
- summaid = (config[0] & 224) >> 5; /* genius tablet-id
-@@ -135,14 +139,14 @@ Gpm_Type *I_summa(int fd, unsigned short
- * unknown tablet ?
- */
- if((summaid < 0) || (summaid == 11)) {
-- resetsumma();
-+ resetsumma(fd);
- write(fd, SS_BINARY_FMT SS_PROMPT_MODE, 3);
- }
-
- /*
- * read tablet size
- */
-- err = waitsumma();
-+ err = waitsumma(fd);
- if(!((err == -1) || (!err)))
- read(fd, buffer, sizeof(buffer));
- write(fd, SS_READCONFIG, 1);
-Index: gpm-1.99.7/src/drivers/wacom/i.c
-===================================================================
---- gpm-1.99.7.orig/src/drivers/wacom/i.c
-+++ gpm-1.99.7/src/drivers/wacom/i.c
-@@ -30,10 +30,6 @@
- #include "message.h" /* gpm_report */
- #include "wacom.h" /* wacom */
-
--Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc,
-- char **argv)
--{
--
- /* wacom graphire tablet */
- #define UD_RESETBAUD "\r$" /* reset baud rate to default (wacom V) */
- /*
-@@ -45,83 +41,91 @@ Gpm_Type *I_wacom(int fd, unsigned short
- #define UD_COORD "~C\r" /* Request max coordinates */
- #define UD_STOP "\nSP\r" /* stop sending coordinates */
-
-- flags = 0; /* FIXME: 1.99.13 */
-
-- void reset_wacom() {
-- /*
-- * Init Wacom communication; this is modified from xf86Wacom.so module
-- */
-- /*
-- * Set speed to 19200
-- */
-- setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL);
-- /*
-- * Send Reset Baudrate Command
-- */
-- write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD));
-- usleep(250000);
-- /*
-- * Send Reset Command
-- */
-- write(fd, UD_RESET, strlen(UD_RESET));
-- usleep(75000);
-- /*
-- * Set speed to 9600bps
-- */
-- setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL);
-- /*
-- * Send Reset Command
-- */
-- write(fd, UD_RESET, strlen(UD_RESET));
-- usleep(250000);
-- write(fd, UD_STOP, strlen(UD_STOP));
-- usleep(100000);
-- }
-+static void reset_wacom(int fd)
-+{
-+ /*
-+ * Init Wacom communication; this is modified from xf86Wacom.so module
-+ */
-+ /*
-+ * Set speed to 19200
-+ */
-+ setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL);
-+ /*
-+ * Send Reset Baudrate Command
-+ */
-+ write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD));
-+ usleep(250000);
-+ /*
-+ * Send Reset Command
-+ */
-+ write(fd, UD_RESET, strlen(UD_RESET));
-+ usleep(75000);
-+ /*
-+ * Set speed to 9600bps
-+ */
-+ setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL);
-+ /*
-+ * Send Reset Command
-+ */
-+ write(fd, UD_RESET, strlen(UD_RESET));
-+ usleep(250000);
-+ write(fd, UD_STOP, strlen(UD_STOP));
-+ usleep(100000);
-+}
-
-- int wait_wacom() {
-- /*
-- * Wait up to 200 ms for Data from Tablet.
-- * Do not read that data.
-- * Give back 0 on timeout condition, -1 on error and 1 for DataPresent
-- */
-- struct timeval timeout;
--
-- fd_set readfds;
--
-- int err;
--
-- FD_ZERO(&readfds);
-- FD_SET(fd, &readfds);
-- timeout.tv_sec = 0;
-- timeout.tv_usec = 200000;
-- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout);
-- return ((err > 0) ? 1 : err);
-- }
-+static int wait_wacom(int fd)
-+{
-+ /*
-+ * Wait up to 200 ms for Data from Tablet.
-+ * Do not read that data.
-+ * Give back 0 on timeout condition, -1 on error and 1 for DataPresent
-+ */
-+ struct timeval timeout;
-
-- char buffer[50], *p;
-+ fd_set readfds;
-
-- int RequestData(char *cmd) {
-- int err;
-+ int err;
-
-- /*
-- * Send cmd if not null, and get back answer from tablet.
-- * Get Data to buffer until full or timeout.
-- * Give back 0 for timeout and !0 for buffer full
-- */
-- if(cmd)
-- write(fd, cmd, strlen(cmd));
-- memset(buffer, 0, sizeof(buffer));
-- p = buffer;
-- err = wait_wacom();
-- while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) {
-- p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer));
-- err = wait_wacom();
-- }
-- /*
-- * return 1 for buffer full
-- */
-- return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0);
-+ FD_ZERO(&readfds);
-+ FD_SET(fd, &readfds);
-+ timeout.tv_sec = 0;
-+ timeout.tv_usec = 200000;
-+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout);
-+ return ((err > 0) ? 1 : err);
-+}
-+
-+static int RequestData(int fd, char *cmd, char *buffer)
-+{
-+ int err;
-+ char *p;
-+ /*
-+ * Send cmd if not null, and get back answer from tablet.
-+ * Get Data to buffer until full or timeout.
-+ * Give back 0 for timeout and !0 for buffer full
-+ */
-+ if(cmd)
-+ write(fd, cmd, strlen(cmd));
-+ memset(buffer, 0, sizeof(buffer));
-+ p = buffer;
-+ err = wait_wacom(fd);
-+ while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) {
-+ p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer));
-+ err = wait_wacom(fd);
- }
-+ /*
-+ * return 1 for buffer full
-+ */
-+ return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0);
-+}
-+
-+Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc,
-+ char **argv)
-+{
-+
-+ flags = 0; /* FIXME: 1.99.13 */
-+
-+ char buffer[50];
-
- /*
- * We do both modes, relative and absolute, with the same function.
-@@ -143,17 +147,17 @@ Gpm_Type *I_wacom(int fd, unsigned short
- };
- parse_argv(optioninfo, argc, argv);
- type->absolute = WacomAbsoluteWanted;
-- reset_wacom();
-+ reset_wacom(fd);
-
- /*
- * "Flush" input queque
- */
-- while(RequestData(NULL)) ;
-+ while(RequestData(fd, NULL, buffer)) ;
-
- /*
- * read WACOM-ID
- */
-- RequestData(UD_FIRMID);
-+ RequestData(fd, UD_FIRMID, buffer);
-
- /*
- * Search for matching modell
-@@ -180,7 +184,7 @@ Gpm_Type *I_wacom(int fd, unsigned short
- * read Wacom max size
- */
- if(WacomModell != (-1) && (!wcmodell[WacomModell].maxX)) {
-- RequestData(UD_COORD);
-+ RequestData(fd, UD_COORD, buffer);
- sscanf(buffer + 2, "%d,%d", &wmaxx, &wmaxy);
- wmaxx = (wmaxx - wcmodell[WacomModell].border);
- wmaxy = (wmaxy - wcmodell[WacomModell].border);
diff --git a/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-oe/recipes-support/gpm/gpm/gpm.service.in
new file mode 100644
index 000000000..ee6c040fa
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm/gpm.service.in
@@ -0,0 +1,9 @@
+[Unit]
+Description=Virtual console mouse server
+
+[Service]
+Type=forking
+ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/init b/meta-oe/recipes-support/gpm/gpm/init
similarity index 100%
rename from meta-oe/recipes-support/gpm/gpm-1.99.7/init
rename to meta-oe/recipes-support/gpm/gpm/init
diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch b/meta-oe/recipes-support/gpm/gpm/no-docs.patch
similarity index 93%
rename from meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch
rename to meta-oe/recipes-support/gpm/gpm/no-docs.patch
index f10217a94..3faef84ee 100644
--- a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch
+++ b/meta-oe/recipes-support/gpm/gpm/no-docs.patch
@@ -11,7 +11,7 @@ Index: gpm-1.99.7/Makefile.in
# user-overridable flags, but it's also all the implicit rule looks at.
# missing ?
--SUBDIRS = src doc contrib gpm2
+-SUBDIRS = src doc contrib
+SUBDIRS = src
diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch
similarity index 100%
rename from meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch
rename to meta-oe/recipes-support/gpm/gpm/processcreds.patch
diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
deleted file mode 100644
index bbb8c28ac..000000000
--- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \
-for the console and xterm, with sample clients included \
-(emacs, etc)."
-SECTION = "console/utils"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f"
-
-PR = "r2"
-
-DEPENDS = "ncurses"
-
-SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
- file://no-docs.patch \
- file://processcreds.patch \
- file://eglibc-2.17.patch \
- file://remove_nested_functions.patch \
- file://init"
-
-inherit autotools-brokensep update-rc.d
-
-INITSCRIPT_NAME = "gpm"
-INITSCRIPT_PARAMS = "defaults"
-
-#export LIBS = "-lm"
-
-# all fields are /* FIXME: gpm 1.99.13 */
-# gpm-1.99.7/src/lib/libhigh.c:171:43: error: parameter 'clientdata' set but not used [-Werror=unused-but-set-parameter]
-# gpm-1.99.7/src/lib/report-lib.c:28:21: error: parameter 'line' set but not used [-Werror=unused-but-set-parameter]
-# gpm-1.99.7/src/lib/report-lib.c:28:33: error: parameter 'file' set but not used [-Werror=unused-but-set-parameter]
-# gpm-1.99.7/src/drivers/empty/i.c:26:23: error: parameter 'fd' set but not used [-Werror=unused-but-set-parameter]
-# gpm-1.99.7/src/drivers/empty/i.c:26:42: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter]
-# gpm-1.99.7/src/drivers/etouch/i.c:34:43: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter]
-# gpm-1.99.7/src/drivers/msc/r.c:32:12: error: variable 'dy' set but not used [-Werror=unused-but-set-variable]
-# gpm-1.99.7/src/drivers/msc/r.c:32:8: error: variable 'dx' set but not used [-Werror=unused-but-set-variable]
-# cc1: all warnings being treated as errors
-CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable"
-
-# twiddler is WIP in 1.99.7 and probably not worth fixing (a lot of changes in gpm-2-dev after 1.99.7
-# gpm-1.99.7/src/drivers/twid/twiddler.c:503:14: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
-# /gpm-1.99.7/src/mice.c:221:5: error: (near initialization for 'mice[32].init') [-Werror]
-CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error"
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
- install -m 0644 src/headers/gpm.h ${D}${includedir}
- install -d ${D}/${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm
- cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1
-}
-SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544"
-SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee"
-
-FILES_${PN} += "${datadir}/emacs"
diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb
new file mode 100644
index 000000000..e6c2daf72
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm_git.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \
+for the console and xterm, with sample clients included \
+(emacs, etc)."
+SECTION = "console/utils"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
+
+PV = "1.99.7+git${SRCREV}"
+PR = "r2"
+SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77"
+
+DEPENDS = "ncurses"
+
+SRC_URI = "git://github.com/telmich/gpm;protocol=git \
+ file://no-docs.patch \
+ file://processcreds.patch \
+ file://init"
+
+S = "${WORKDIR}/git"
+
+inherit autotools-brokensep update-rc.d systemd
+
+INITSCRIPT_NAME = "gpm"
+INITSCRIPT_PARAMS = "defaults"
+
+do_configure_prepend() {
+ (cd ${S};./autogen.sh;cd -)
+}
+
+do_install_append () {
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+ install -d ${D}${systemd_system_unitdir}
+ sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service
+ fi
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+ install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm
+ fi
+ install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h
+}
+
+SYSTEMD_SERVICE_${PN} = "gpm.service"
+
+FILES_${PN} += "${datadir}/emacs"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH V2 02/16] rapidjson: Update to 1.1.0 + git
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 21:30 ` Andre McCurdy
2017-03-20 5:31 ` [meta-oe][PATCH V2 03/16] libtorrent, rtorrent: Update to latest Khem Raj
` (13 subsequent siblings)
14 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Drop backports
Adjust the license checksums to match the changes to file especially
https://github.com/miloyip/rapidjson/commit/b4b1a39937fbd168ef72ea477f90f626773d56fc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../Fix-gcc-strict-overflow-warning.patch | 30 ----------------
.../remove-march-native-from-CMAKE_CXX_FLAGS.patch | 41 +++++++++++++---------
.../{rapidjson_1.0.2.bb => rapidjson_git.bb} | 9 ++---
3 files changed, 29 insertions(+), 51 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
rename meta-oe/recipes-devtools/rapidjson/{rapidjson_1.0.2.bb => rapidjson_git.bb} (73%)
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
deleted file mode 100644
index 6ce3933ce..000000000
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f5560d9557ee48fb79810180ddfd3ec386e2a7b5 Mon Sep 17 00:00:00 2001
-From: Milo Yip <miloyip@gmail.com>
-Date: Wed, 2 Mar 2016 01:01:17 +0800
-Subject: [PATCH] Fix gcc strict-overflow warning
-
-Fix #566 #568
-
-Upstream-Status: Backport [Partial merge of upstream commit 928caf92e]
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
----
- include/rapidjson/internal/dtoa.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h
-index 2d8d2e4..15571e1 100644
---- a/include/rapidjson/internal/dtoa.h
-+++ b/include/rapidjson/internal/dtoa.h
-@@ -148,7 +148,7 @@ inline char* WriteExponent(int K, char* buffer) {
- inline char* Prettify(char* buffer, int length, int k) {
- const int kk = length + k; // 10^(kk-1) <= v < 10^kk
-
-- if (length <= kk && kk <= 21) {
-+ if (0 <= k && kk <= 21) {
- // 1234e7 -> 12340000000
- for (int i = length; i < kk; i++)
- buffer[i] = '0';
---
-1.9.1
-
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
index 17164283c..cf3e16ea5 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
@@ -12,22 +12,29 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 68139ba..cae7c9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,9 +26,9 @@ if(RAPIDJSON_HAS_STDSTRING)
- endif()
+Index: git/CMakeLists.txt
+===================================================================
+--- git.orig/CMakeLists.txt
++++ git/CMakeLists.txt
+@@ -51,10 +51,10 @@ endif(CCACHE_FOUND)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
- elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
- endif()
---
-1.9.1
-
+ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ else()
+ #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
+ set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
+@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
+ else()
+ #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
+ set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything)
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
similarity index 73%
rename from meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb
rename to meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index dd6b89698..4cded0720 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -2,20 +2,21 @@ SUMMARY = "A fast JSON parser/generator for C++ with both SAX/DOM style API"
HOMEPAGE = "http://rapidjson.org/"
SECTION = "libs"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://license.txt;md5=cff54e417a17b4b77465198254970cd2"
+LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \
file://remove-march-native-from-CMAKE_CXX_FLAGS.patch \
- file://Fix-gcc-strict-overflow-warning.patch \
"
-SRCREV = "3d5848a7cd3367c5cb451c6493165b7745948308"
+SRCREV = "e5635fb27feab7f6e8d7b916aa20ad799045a641"
+
+PV = "1.1.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit cmake
-EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF"
+EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF"
# RapidJSON is a header-only C++ library, so the main package will be empty.
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH V2 03/16] libtorrent, rtorrent: Update to latest
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH V2 02/16] rapidjson: Update to 1.1.0 + git Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-xfce][PATCH V2 04/16] core-image-minimal-xfce: Drop ROOTFS_PKGMANAGE_BOOTSTRAP Khem Raj
` (12 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
libtorrent -> 0.13.6+git
rtorrent -> 0.9.6+git
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../{libtorrent_0.13.3.bb => libtorrent_git.bb} | 15 +++++++++++----
.../rtorrent/{rtorrent_0.9.3.bb => rtorrent_git.bb} | 12 +++++++++---
2 files changed, 20 insertions(+), 7 deletions(-)
rename meta-oe/recipes-connectivity/libtorrent/{libtorrent_0.13.3.bb => libtorrent_git.bb} (53%)
rename meta-oe/recipes-connectivity/rtorrent/{rtorrent_0.9.3.bb => rtorrent_git.bb} (60%)
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
similarity index 53%
rename from meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb
rename to meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
index 4af3a6a6a..aaebc5f1b 100644
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb
+++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
@@ -4,14 +4,21 @@ HOMEPAGE = "http://libtorrent.rakshasa.no/"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-DEPENDS = "libsigc++-2.0 openssl cppunit"
+DEPENDS = "zlib libsigc++-2.0 openssl cppunit"
-SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \
+SRC_URI = "git://github.com/rakshasa/libtorrent \
file://don-t-run-code-while-configuring-package.patch \
"
+SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87"
-SRC_URI[md5sum] = "e94f6c590bb02aaf4d58618f738a85f2"
-SRC_URI[sha256sum] = "34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677"
+PV = "0.13.6+git${SRCPV}"
+
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
+EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}"
+
+do_configure_prepend() {
+ (cd ${S}; ./autogen.sh; cd -)
+}
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
similarity index 60%
rename from meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb
rename to meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
index eb0a39af5..af1c4d656 100644
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb
+++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
@@ -5,11 +5,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses"
-SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \
+SRC_URI = "git://github.com/rakshasa/rtorrent \
file://don-t-run-code-while-configuring-package.patch \
"
+SRCREV = "226e670decf92e7adaa845a6982aca4f164ea740"
-SRC_URI[md5sum] = "0bf2f262faa8c8c8d3b11ce286ea2bf2"
-SRC_URI[sha256sum] = "9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310"
+PV = "0.9.6+git${SRCPV}"
+
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
+
+do_configure_prepend() {
+ (cd ${S}; ./autogen.sh; cd -)
+}
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-xfce][PATCH V2 04/16] core-image-minimal-xfce: Drop ROOTFS_PKGMANAGE_BOOTSTRAP
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH V2 02/16] rapidjson: Update to 1.1.0 + git Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH V2 03/16] libtorrent, rtorrent: Update to latest Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 05/16] sgio: Fix missing GNU_HASH errors Khem Raj
` (11 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
OE-Core has now dropped this var
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-xfce/recipes-core/images/core-image-minimal-xfce.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb b/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb
index a683c2dd4..f5c5c26ae 100644
--- a/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb
+++ b/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb
@@ -1,7 +1,6 @@
DESCRIPTION = "A XFCE minimal demo image."
IMAGE_INSTALL = "packagegroup-core-boot \
- ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
packagegroup-core-x11 \
packagegroup-xfce-base \
kernel-modules \
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 05/16] sgio: Fix missing GNU_HASH errors
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (2 preceding siblings ...)
2017-03-20 5:31 ` [meta-xfce][PATCH V2 04/16] core-image-minimal-xfce: Drop ROOTFS_PKGMANAGE_BOOTSTRAP Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-multimedia][PATCH 06/16] libmatroska: " Khem Raj
` (10 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...0001-makefile-Add-LDFLAGS-to-linking-rule.patch | 29 ++++++++++++++++++++++
meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb | 8 +++---
2 files changed, 33 insertions(+), 4 deletions(-)
create mode 100644 meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch
diff --git a/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch b/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch
new file mode 100644
index 000000000..87fdd6058
--- /dev/null
+++ b/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch
@@ -0,0 +1,29 @@
+From 92bf2f24d4762efd1dbcc4add457e2b600aa50cf Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 18 Mar 2017 08:02:17 -0700
+Subject: [PATCH] makefile: Add LDFLAGS to linking rule
+
+This make it use correct link flags and fixes errors like
+No GNU_HASH in the elf binary
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c2b0bc7..cdfb58f 100755
+--- a/Makefile
++++ b/Makefile
+@@ -34,7 +34,7 @@ sgpio.o: sgpio.c
+ ${CC} $(CFLAGS) -c sgpio.c
+
+ sgpio: sgpio.o
+- ${CC} -g sgpio.o -o sgpio
++ ${CC} $(LDFLAGS) -g sgpio.o -o sgpio
+
+ clean:
+ rm -f sgpio.o sgpio
+--
+2.12.0
+
diff --git a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
index ed7c413fd..ee7bcdabb 100644
--- a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
+++ b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
@@ -1,10 +1,10 @@
SUMMARY = "SGPIO captive backplane tool"
DESCRIPTION = "Intel SGPIO enclosure management utility"
-SRC_URI = " \
- http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-1.2-0.10-src.tar.gz/a417bf68da4e9bd79a4664c11d7debd1/${BPN}-1.2-0.10-src.tar.gz \
- file://Makefile-error-fix.patch \
-"
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-1.2-0.10-src.tar.gz/a417bf68da4e9bd79a4664c11d7debd1/${BPN}-1.2-0.10-src.tar.gz \
+ file://Makefile-error-fix.patch \
+ file://0001-makefile-Add-LDFLAGS-to-linking-rule.patch \
+ "
SRC_URI[md5sum] = "a417bf68da4e9bd79a4664c11d7debd1"
SRC_URI[sha256sum] = "9bf8c42acaa247efd9321bdb1fc2390022f0c554d77fbbd4a7363d990fc0270b"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-multimedia][PATCH 06/16] libmatroska: Fix missing GNU_HASH errors
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (3 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 05/16] sgio: Fix missing GNU_HASH errors Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 07/16] smstools3: Fix " Khem Raj
` (9 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...1-Makefile-Use-LINKFLAGS-during-link-step.patch | 28 ++++++++++++++++++++++
.../recipes-mkv/libmatroska/libmatroska_1.4.1.bb | 4 +++-
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch
diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch
new file mode 100644
index 000000000..90e997561
--- /dev/null
+++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch
@@ -0,0 +1,28 @@
+From f0c879097c331d1dabe6ee92b583a8badb62ea6d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 18 Mar 2017 08:26:35 -0700
+Subject: [PATCH] Makefile: Use LINKFLAGS during link step
+
+Adds much needed GNU_HASH section into the .so
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ make/linux/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/make/linux/Makefile b/make/linux/Makefile
+index 3ca7b0f..b5c9645 100644
+--- a/make/linux/Makefile
++++ b/make/linux/Makefile
+@@ -104,7 +104,7 @@ $(LIBRARY): $(objects)
+ $(RANLIB) $@
+
+ $(LIBRARY_SO): $(objects_so)
+- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
++ $(CXX) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
+ rm -f $(LIBRARY_SO)
+ ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+
+--
+2.12.0
+
diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb
index 1ad87cba7..fdffa41ec 100644
--- a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb
+++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = "libebml"
-SRC_URI = "http://dl.matroska.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
+SRC_URI = "http://dl.matroska.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
+ file://0001-Makefile-Use-LINKFLAGS-during-link-step.patch \
+ "
SRC_URI[md5sum] = "f61b2e5086f4bb9d24a43cc8af43a719"
SRC_URI[sha256sum] = "086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 07/16] smstools3: Fix GNU_HASH errors
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (4 preceding siblings ...)
2017-03-20 5:31 ` [meta-multimedia][PATCH 06/16] libmatroska: " Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 08/16] procmail: Fix GNU_HASH errors, pass LDFLAGS Khem Raj
` (8 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
pass correct LDFLAGS to build
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
index b8a9d4a23..310a13c22 100644
--- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
+++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb
@@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234
S = "${WORKDIR}/${BPN}"
+EXTRA_OEMAKE += "LFLAGS='${LDFLAGS}'"
+
RDEPENDS_${PN} = "bash"
INITSCRIPT_NAME = "sms3"
INITSCRIPT_PARAMS = "defaults"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 08/16] procmail: Fix GNU_HASH errors, pass LDFLAGS
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (5 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 07/16] smstools3: Fix " Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 09/16] gradm: Fix GNU_HASH QA errors Khem Raj
` (7 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/procmail/procmail_3.22.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-oe/recipes-support/procmail/procmail_3.22.bb
index 9bbd4103c..aa474ceb1 100644
--- a/meta-oe/recipes-support/procmail/procmail_3.22.bb
+++ b/meta-oe/recipes-support/procmail/procmail_3.22.bb
@@ -29,11 +29,11 @@ do_configure() {
export CFLAGS="${BUILD_CFLAGS}"
export AR="${BUILD_AR}"
export AS="${BUILD_AS}"
- make TARGET_CFLAGS="$TARGET_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" autoconf.h
+ make TARGET_CFLAGS="$TARGET_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" autoconf.h
}
do_compile() {
- oe_runmake -i TARGET_CFLAGS="$TARGET_CFLAGS -Wno-comments -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+ oe_runmake -i TARGET_CFLAGS="$TARGET_CFLAGS -Wno-comments -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}"
}
do_install() {
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 09/16] gradm: Fix GNU_HASH QA errors
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (6 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 08/16] procmail: Fix GNU_HASH errors, pass LDFLAGS Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 10/16] zile: Fix build with musl Khem Raj
` (6 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...file-Append-instead-of-overriding-LDFLAGS.patch | 26 ++++++++++++++++++++++
meta-oe/recipes-support/gradm/gradm_3.1.bb | 4 +++-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch
diff --git a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch
new file mode 100644
index 000000000..09a60127a
--- /dev/null
+++ b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch
@@ -0,0 +1,26 @@
+From d67e93ada37d7237983fd10894c18b92f4243d50 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 18 Mar 2017 08:51:45 -0700
+Subject: [PATCH] Makefile: Append instead of overriding LDFLAGS
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 28557ff..deed94c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,7 @@ OPT_FLAGS := -O2
+ # for older versions of grsecurity, comment the above line and uncomment the below:
+ #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi)
+ CFLAGS := $(OPT_FLAGS) -fPIE -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE
+-LDFLAGS= -pie
++LDFLAGS+= -pie
+ INSTALL = /usr/bin/install -c
+
+ # FHS
+--
+2.12.0
+
diff --git a/meta-oe/recipes-support/gradm/gradm_3.1.bb b/meta-oe/recipes-support/gradm/gradm_3.1.bb
index 252b19de2..1a4261a9e 100644
--- a/meta-oe/recipes-support/gradm/gradm_3.1.bb
+++ b/meta-oe/recipes-support/gradm/gradm_3.1.bb
@@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b"
DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \
- file://0001-Makefile-remove-strip.patch"
+ file://0001-Makefile-remove-strip.patch \
+ file://0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch \
+ "
SRC_URI[md5sum] = "ecec72d3a9b6d84c00eda97957b707b6"
SRC_URI[sha256sum] = "2f14c357bf0459e502a4e108b76c3f6240aa484762d07bb1687796b9b9297a50"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 10/16] zile: Fix build with musl
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (7 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 09/16] gradm: Fix GNU_HASH QA errors Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-networking][PATCH 11/16] libmemcached: Upgrade to 1.0.18 Khem Raj
` (5 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
With musl charset.alias is generated due to a gnu-config bug
Fixes
QA Issue: zile: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/charset.alias
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/zile/zile_2.4.11.bb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta-oe/recipes-support/zile/zile_2.4.11.bb b/meta-oe/recipes-support/zile/zile_2.4.11.bb
index ff0517c8a..05a6afbe9 100644
--- a/meta-oe/recipes-support/zile/zile_2.4.11.bb
+++ b/meta-oe/recipes-support/zile/zile_2.4.11.bb
@@ -14,6 +14,11 @@ SRC_URI[sha256sum] = "1fd27bbddc61491b1fbb29a345d0d344734aa9e80cfa07b02892eedf83
inherit autotools pkgconfig
+do_install_append() {
+ rm -rf ${D}${libdir}/charset.alias
+ rmdir --ignore-fail-on-non-empty ${D}${libdir}
+}
+
PACKAGECONFIG ??= ""
PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-networking][PATCH 11/16] libmemcached: Upgrade to 1.0.18
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (8 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 10/16] zile: Fix build with musl Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 12/16] picocom: Upgrade to 2.2 Khem Raj
` (4 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Fix with musl along
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../files/0001-Fix-comparison-types.patch | 38 ++++++++++++++++++++++
...1-configure.ac-Do-not-configure-build-aux.patch | 28 ++++++++++++++++
..._USEVFORK-is-not-linux-specific-but-glibc.patch | 30 +++++++++++++++++
.../recipes-support/libmemcached/libmemcached.inc | 1 +
.../libmemcached/libmemcached_1.0.15.bb | 6 ----
.../libmemcached/libmemcached_1.0.18.bb | 10 ++++++
6 files changed, 107 insertions(+), 6 deletions(-)
create mode 100644 meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch
create mode 100644 meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch
create mode 100644 meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch
delete mode 100644 meta-networking/recipes-support/libmemcached/libmemcached_1.0.15.bb
create mode 100644 meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
diff --git a/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch b/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch
new file mode 100644
index 000000000..26b5e250c
--- /dev/null
+++ b/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch
@@ -0,0 +1,38 @@
+From ed4422979b221c8613ca02eb5c57cb80009366d1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 18 Mar 2017 10:13:24 -0700
+Subject: [PATCH 1/2] Fix comparison types
+
+Fixes
+error: comparison between pointer and integer ('char *' and 'int')
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ clients/memflush.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/clients/memflush.cc b/clients/memflush.cc
+index 8bd0dbf..71545ea 100644
+--- a/clients/memflush.cc
++++ b/clients/memflush.cc
+@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
+ {
+ options_parse(argc, argv);
+
+- if (opt_servers == false)
++ if (opt_servers == NULL)
+ {
+ char *temp;
+
+@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
+ opt_servers= strdup(temp);
+ }
+
+- if (opt_servers == false)
++ if (opt_servers == NULL)
+ {
+ std::cerr << "No Servers provided" << std::endl;
+ exit(EXIT_FAILURE);
+--
+2.12.0
+
diff --git a/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch b/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch
new file mode 100644
index 000000000..06febc5b1
--- /dev/null
+++ b/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch
@@ -0,0 +1,28 @@
+From fa0fe001a5373c1ef9ff2175555b14fc07399e1b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 18 Mar 2017 10:01:44 -0700
+Subject: [PATCH] configure.ac: Do not configure build-aux
+
+Fixes
+configure: error: cannot find install-sh, install.sh, or shtool
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 17b7351..0263112 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,6 @@ AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
+ AC_PROG_CC([cc gcc clang])
+ AC_PROG_CXX([c++ g++ clang++])
+
+-AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+
+ AC_CANONICAL_HOST
+--
+2.12.0
+
diff --git a/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch b/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch
new file mode 100644
index 000000000..e1e1be8c6
--- /dev/null
+++ b/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch
@@ -0,0 +1,30 @@
+From e95609e4ae40a794ed198924505fd22d7d86a124 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 18 Mar 2017 10:16:14 -0700
+Subject: [PATCH 2/2] POSIX_SPAWN_USEVFORK is not linux specific but glibc
+ specific
+
+Fixes
+cmdline.cc:206:12: error: use of undeclared identifier 'POSIX_SPAWN_USEVFORK'
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libtest/cmdline.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
+index 29a22de..34f0a89 100644
+--- a/libtest/cmdline.cc
++++ b/libtest/cmdline.cc
+@@ -201,7 +201,7 @@ Application::error_t Application::run(const char *args[])
+
+ fatal_assert(posix_spawnattr_setsigmask(&spawnattr, &mask) == 0);
+
+-#if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__)
++#if defined(POSIX_SPAWN_USEVFORK) || defined(__GLIBC__)
+ // Use USEVFORK on linux
+ flags |= POSIX_SPAWN_USEVFORK;
+ #endif
+--
+2.12.0
+
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-networking/recipes-support/libmemcached/libmemcached.inc
index 172443a20..e86f832f8 100644
--- a/meta-networking/recipes-support/libmemcached/libmemcached.inc
+++ b/meta-networking/recipes-support/libmemcached/libmemcached.inc
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60"
SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz"
TARGET_LDFLAGS += "-luuid"
+TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE"
PACKAGECONFIG ??= ""
PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.15.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.15.bb
deleted file mode 100644
index 18232b4ce..000000000
--- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.15.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libmemcached.inc
-
-SRC_URI += "file://crosscompile.patch"
-
-SRC_URI[md5sum] = "616297a1aedefc52b3f6922eda5d559a"
-SRC_URI[sha256sum] = "dd7e9560029835bddf761a5b4c2339d9e5c7374558659b6c11b2c95e7d3a4325"
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
new file mode 100644
index 000000000..56778c048
--- /dev/null
+++ b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
@@ -0,0 +1,10 @@
+require libmemcached.inc
+
+SRC_URI += "\
+ file://crosscompile.patch \
+ file://0001-configure.ac-Do-not-configure-build-aux.patch \
+ file://0001-Fix-comparison-types.patch \
+ file://0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch \
+ "
+SRC_URI[md5sum] = "b3958716b4e53ddc5992e6c49d97e819"
+SRC_URI[sha256sum] = "e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 12/16] picocom: Upgrade to 2.2
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (9 preceding siblings ...)
2017-03-20 5:31 ` [meta-networking][PATCH 11/16] libmemcached: Upgrade to 1.0.18 Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-30 9:45 ` Martin Jansa
2017-03-20 5:31 ` [meta-oe][PATCH 13/16] samsung-soc-utils: Remove -static Khem Raj
` (3 subsequent siblings)
14 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Package has moved to github
License file got some cosmetic changes see
https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb | 22 ++++++++++++++++++++++
meta-oe/recipes-support/picocom/picocom_1.7.bb | 19 -------------------
meta-oe/recipes-support/picocom/picocom_git.bb | 23 +++++++++++++++++++++++
3 files changed, 45 insertions(+), 19 deletions(-)
create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
delete mode 100644 meta-oe/recipes-support/picocom/picocom_1.7.bb
create mode 100644 meta-oe/recipes-support/picocom/picocom_git.bb
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
new file mode 100644
index 000000000..96fbd350b
--- /dev/null
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
@@ -0,0 +1,22 @@
+require lcdproc5.inc
+SRC_URI[md5sum] = "2f8e064233ef1d03e98c0b426595750d"
+SRC_URI[sha256sum] = "843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804"
+
+PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
+PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid"
+PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"
+
+LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
+
+do_install_append () {
+ # binaries
+ install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
+
+ # configuration files
+ install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
+}
+
+PACKAGES =+ "lcdvc"
+CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
+FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc"
+
diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb
deleted file mode 100644
index d2a76c0a9..000000000
--- a/meta-oe/recipes-support/picocom/picocom_1.7.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
-SECTION = "console/utils"
-LICENSE = "GPLv2+"
-HOMEPAGE = "http://code.google.com/p/picocom/"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef"
-SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e"
-
-EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
- 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
-
-do_install () {
- install -d ${D}${bindir}
- install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
-}
-
diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb
new file mode 100644
index 000000000..e091094cf
--- /dev/null
+++ b/meta-oe/recipes-support/picocom/picocom_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
+SECTION = "console/utils"
+LICENSE = "GPLv2+"
+HOMEPAGE = "http://code.google.com/p/picocom/"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"
+
+BASEPV = "2.2"
+PV = "${BASEPV}+git${SRCPV}"
+
+SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc"
+
+SRC_URI = "git://github.com/npat-efault/picocom"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \
+ 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
+}
+
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 13/16] samsung-soc-utils: Remove -static
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (10 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 12/16] picocom: Upgrade to 2.2 Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 14/16] digitemp: Update past 3.7.1 release Khem Raj
` (2 subsequent siblings)
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
It does not build with all combinations e.g. with -fPIE
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb | 2 +-
meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
index 082dc005f..255754d5d 100644
--- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
+++ b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/gpio"
CLEANBROKEN = "1"
do_compile() {
- ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c
+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio.c
}
do_install() {
diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
index bed0555c2..976a4f15e 100644
--- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
+++ b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/gpio"
CLEANBROKEN = "1"
do_compile() {
- ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio-s3c6410.c
+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio-s3c6410.c
}
do_install() {
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 14/16] digitemp: Update past 3.7.1 release
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (11 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 13/16] samsung-soc-utils: Remove -static Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 15/16] memstat: Fix build with musl Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 16/16] libexecinfo: Add recipe Khem Raj
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Fetch from github
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../digitemp/digitemp/makefile-fix.patch | 20 ----------------
meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb | 27 ----------------------
meta-oe/recipes-support/digitemp/digitemp_git.bb | 25 ++++++++++++++++++++
3 files changed, 25 insertions(+), 47 deletions(-)
delete mode 100644 meta-oe/recipes-support/digitemp/digitemp/makefile-fix.patch
delete mode 100644 meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb
create mode 100644 meta-oe/recipes-support/digitemp/digitemp_git.bb
diff --git a/meta-oe/recipes-support/digitemp/digitemp/makefile-fix.patch b/meta-oe/recipes-support/digitemp/digitemp/makefile-fix.patch
deleted file mode 100644
index c0d552d54..000000000
--- a/meta-oe/recipes-support/digitemp/digitemp/makefile-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-digitemp: allow override of CC and CFLAGS vars
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-
---- a/Makefile 2008-08-28 21:37:00.000000000 +0000
-+++ b/Makefile 2011-11-24 22:22:39.882511272 +0000
-@@ -11,8 +11,9 @@
-
- VERSION = 3.6.0
-
--CC = gcc
--CFLAGS = -I./src -I./userial -O2 -Wall # -g
-+CC ?= gcc
-+CFLAGS ?= -O2 -Wall # -g
-+CFLAGS += -I./src -I./userial
-
- OBJS = src/digitemp.o src/device_name.o src/ds2438.o
- HDRS = src/digitemp.h src/device_name.h
diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb b/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb
deleted file mode 100644
index 2582820e6..000000000
--- a/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "read temperature sensors in a 1-Wire net"
-SECTION = "util"
-DEPENDS = "libusb1"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
-
-PR = "r2"
-
-SRC_URI = "http://www.digitemp.com/software/linux/digitemp-${PV}.tar.gz \
- file://makefile-fix.patch"
-SRC_URI[md5sum] = "9be2e48db37920f21925ae6e88f83b84"
-SRC_URI[sha256sum] = "14cfc584cd3714fe8c9a2cdc8388be49e08b5e395d95e6bcd11d4410e2505ca2"
-
-EXTRA_OEMAKE = "ds9097 ds9097u \
- SYSTYPE='Linux' \
-"
-# Fix GNU_HASH QA errors
-TARGET_CC_ARCH += "${CFLAGS} ${LDFLAGS}"
-
-do_configure() {
- rm -f digitemp_*
-}
-
-do_install() {
- install -d ${D}${sbindir}
- install digitemp_* ${D}${sbindir}
-}
diff --git a/meta-oe/recipes-support/digitemp/digitemp_git.bb b/meta-oe/recipes-support/digitemp/digitemp_git.bb
new file mode 100644
index 000000000..460aa1438
--- /dev/null
+++ b/meta-oe/recipes-support/digitemp/digitemp_git.bb
@@ -0,0 +1,25 @@
+SUMMARY = "read temperature sensors in a 1-Wire net"
+SECTION = "util"
+DEPENDS = "libusb1"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
+
+PV = "3.7.1+git${SRCPV}"
+
+SRC_URI = "git://github.com/bcl/digitemp"
+
+SRCREV = "389f67655efa1674f595106c3a47b5ad082609a7"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = "ds9097 ds9097u \
+ SYSTYPE='Linux' \
+"
+do_configure() {
+ rm -f digitemp_*
+}
+
+do_install() {
+ install -d ${D}${sbindir}
+ install -m 0755 digitemp_* ${D}${sbindir}
+}
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 15/16] memstat: Fix build with musl
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (12 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 14/16] digitemp: Update past 3.7.1 release Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 16/16] libexecinfo: Add recipe Khem Raj
14 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...-Include-limits.h-for-PATH_MAX-definition.patch | 29 ++++++++++++++++++++++
meta-oe/recipes-devtools/memstat/memstat_1.0.bb | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch
diff --git a/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch b/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch
new file mode 100644
index 000000000..9a0a17e0e
--- /dev/null
+++ b/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch
@@ -0,0 +1,29 @@
+From 4b6c957372314562bf7b9117103e3a08643eb7b8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 18 Mar 2017 17:47:28 -0700
+Subject: [PATCH] Include limits.h for PATH_MAX definition
+
+Fixes
+
+error: use of undeclared identifier 'PATH_MAX'
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ memstat.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/memstat.c b/memstat.c
+index 5039fb0..3ff6ee4 100644
+--- a/memstat.c
++++ b/memstat.c
+@@ -19,6 +19,7 @@
+ #include <unistd.h>
+ #include <getopt.h>
+ #include <errno.h>
++#include <limits.h>
+
+ /* blacklist devices that just map physical memory */
+ char *blacklist[] = {
+--
+2.12.0
+
diff --git a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
index 825215372..91a9200c3 100644
--- a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
+++ b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
@@ -13,7 +13,8 @@ S = "${WORKDIR}/memstattool"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=87be186443b1ac2cfa466f475e1ee0cb"
SRC_URI = "http://sourceforge.net/projects/memstattool/files/memstat_${PV}.tar.gz \
- "
+ file://0001-Include-limits.h-for-PATH_MAX-definition.patch \
+ "
SRC_URI[md5sum] = "2c3acc0c62b2a18f6601b84e54aa7462"
SRC_URI[sha256sum] = "245d5fc7fb87bcfd14486cd34917cae2856e799559ac568434af12c4852bce94"
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 16/16] libexecinfo: Add recipe
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
` (13 preceding siblings ...)
2017-03-20 5:31 ` [meta-oe][PATCH 15/16] memstat: Fix build with musl Khem Raj
@ 2017-03-20 5:31 ` Khem Raj
2017-03-30 9:46 ` Martin Jansa
14 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2017-03-20 5:31 UTC (permalink / raw)
To: openembedded-devel
This package is handy especially with musl to port
apps which use glibc backtrace APIs
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-makefile-Fix-build-on-linux.patch | 59 ++++++++++++++++
...x-compiler-errors-found-with-newer-gcc-cl.patch | 79 ++++++++++++++++++++++
.../libexecinfo/libexecinfo_1.1.bb | 27 ++++++++
3 files changed, 165 insertions(+)
create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
new file mode 100644
index 000000000..f1863f14b
--- /dev/null
+++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
@@ -0,0 +1,59 @@
+From 910bbc2cb6cc1cfa6deed9d170da02a639902c7c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 19 Mar 2017 16:14:54 -0700
+Subject: [PATCH 1/2] makefile: Fix build on linux
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 33 +++++++++++++++++----------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+Index: libexecinfo-1.1/Makefile
+===================================================================
+--- libexecinfo-1.1.orig/Makefile
++++ libexecinfo-1.1/Makefile
+@@ -23,24 +23,25 @@
+ # SUCH DAMAGE.
+ #
+ # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $
++#
++# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04
+
+-LIB= execinfo
+-
+-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h
+-
+-INCS= execinfo.h
+-
+-SHLIB_MAJOR= 1
+-SHLIB_MINOR= 0
+-
+-NOPROFILE= yes
+-
+-DPADD= ${LIBM}
+-LDADD= -lm
+-
+-#WARNS?= 4
+-
+-#stacktraverse.c: gen.py
+-# ./gen.py > stacktraverse.c
++CC?=cc
++AR?=ar
++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c
++EXECINFO_LDFLAGS=$(LDFLAGS)
++
++all: static dynamic
++
++static:
++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c
++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c
++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o
++
++dynamic:
++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So
++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So
++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 $(EXECINFO_LDFLAGS) stacktraverse.So execinfo.So
+
+-.include <bsd.lib.mk>
++clean:
++ rm -rf *.o *.So *.a *.so
diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
new file mode 100644
index 000000000..423b67082
--- /dev/null
+++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
@@ -0,0 +1,79 @@
+From 0810817773fb81d7383d2fa8464244c8f79845fb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 19 Mar 2017 16:16:18 -0700
+Subject: [PATCH 2/2] execinfo: Fix compiler errors found with newer gcc/clang
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ execinfo.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/execinfo.c b/execinfo.c
+index 906fb14..9448b60 100644
+--- a/execinfo.c
++++ b/execinfo.c
+@@ -69,7 +69,8 @@ backtrace(void **buffer, int size)
+ char **
+ backtrace_symbols(void *const *buffer, int size)
+ {
+- int i, clen, alen, offset;
++ size_t clen, alen;
++ int i, offset;
+ char **rval;
+ char *cp;
+ Dl_info info;
+@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size)
+ rval = malloc(clen);
+ if (rval == NULL)
+ return NULL;
+- (char **)cp = &(rval[size]);
+ for (i = 0; i < size; i++) {
+ if (dladdr(buffer[i], &info) != 0) {
+ if (info.dli_sname == NULL)
+@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size)
+ 2 + /* " <" */
+ strlen(info.dli_sname) + /* "function" */
+ 1 + /* "+" */
+- D10(offset) + /* "offset */
++ 10 + /* "offset */
+ 5 + /* "> at " */
+ strlen(info.dli_fname) + /* "filename" */
+ 1; /* "\0" */
+ rval = realloc_safe(rval, clen + alen);
+ if (rval == NULL)
+ return NULL;
+- snprintf(cp, alen, "%p <%s+%d> at %s",
++ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
+ buffer[i], info.dli_sname, offset, info.dli_fname);
+ } else {
+ alen = 2 + /* "0x" */
+@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, int size)
+ rval = realloc_safe(rval, clen + alen);
+ if (rval == NULL)
+ return NULL;
+- snprintf(cp, alen, "%p", buffer[i]);
++ snprintf((char *) rval + clen, alen, "%p", buffer[i]);
+ }
+- rval[i] = cp;
+- cp += alen;
++ rval[i] = (char *) clen;
++ clen += alen;
+ }
+
++ for (i = 0; i < size; i++)
++ rval[i] += (long) rval;
++
+ return rval;
+ }
+
+@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd)
+ return;
+ snprintf(buf, len, "%p\n", buffer[i]);
+ }
+- write(fd, buf, len - 1);
++ write(fd, buf, strlen(buf));
+ }
+ }
+--
+2.12.0
+
diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
new file mode 100644
index 000000000..48d14dd62
--- /dev/null
+++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
@@ -0,0 +1,27 @@
+# Copyright (C) 2017 Khem Raj <raj.khem@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility."
+HOMEPAGE = "http://www.freshports.org/devel/libexecinfo"
+LIC_FILES_CHKSUM = "file://execinfo.c;endline=25;md5=85bd3fa4ea9acae5182e29db063fe2e5"
+LICENSE = "BSD-2-Clause"
+SECTION = "libs"
+DEPENDS = ""
+
+SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \
+ file://0001-makefile-Fix-build-on-linux.patch \
+ file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \
+ "
+SRC_URI[md5sum] = "8e9e81c554c1c5d735bc877448e92b91"
+SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f"
+
+CFLAGS += "-fno-omit-frame-pointer"
+
+do_install() {
+ install -D -m 0744 ${S}/execinfo.h ${D}${includedir}/execinfo.h
+ install -D -m 0744 ${S}/stacktraverse.h ${D}${includedir}/stacktraverse.h
+ install -D -m 0744 ${B}/libexecinfo.a ${D}${libdir}/libexecinfo.a
+ install -D -m 0755 ${B}/libexecinfo.so.1 ${D}${libdir}/libexecinfo.so.1
+ ln -s libexecinfo.so.1 ${D}${libdir}/libexecinfo.so
+}
+
--
2.12.0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH V2 02/16] rapidjson: Update to 1.1.0 + git
2017-03-20 5:31 ` [meta-oe][PATCH V2 02/16] rapidjson: Update to 1.1.0 + git Khem Raj
@ 2017-03-20 21:30 ` Andre McCurdy
2017-03-20 21:39 ` Khem Raj
0 siblings, 1 reply; 22+ messages in thread
From: Andre McCurdy @ 2017-03-20 21:30 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Sun, Mar 19, 2017 at 10:31 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Drop backports
> Adjust the license checksums to match the changes to file especially
>
> https://github.com/miloyip/rapidjson/commit/b4b1a39937fbd168ef72ea477f90f626773d56fc
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../Fix-gcc-strict-overflow-warning.patch | 30 ----------------
> .../remove-march-native-from-CMAKE_CXX_FLAGS.patch | 41 +++++++++++++---------
> .../{rapidjson_1.0.2.bb => rapidjson_git.bb} | 9 ++---
> 3 files changed, 29 insertions(+), 51 deletions(-)
> delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
> rename meta-oe/recipes-devtools/rapidjson/{rapidjson_1.0.2.bb => rapidjson_git.bb} (73%)
>
> diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
> deleted file mode 100644
> index 6ce3933ce..000000000
> --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From f5560d9557ee48fb79810180ddfd3ec386e2a7b5 Mon Sep 17 00:00:00 2001
> -From: Milo Yip <miloyip@gmail.com>
> -Date: Wed, 2 Mar 2016 01:01:17 +0800
> -Subject: [PATCH] Fix gcc strict-overflow warning
> -
> -Fix #566 #568
> -
> -Upstream-Status: Backport [Partial merge of upstream commit 928caf92e]
> -
> -Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ----
> - include/rapidjson/internal/dtoa.h | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h
> -index 2d8d2e4..15571e1 100644
> ---- a/include/rapidjson/internal/dtoa.h
> -+++ b/include/rapidjson/internal/dtoa.h
> -@@ -148,7 +148,7 @@ inline char* WriteExponent(int K, char* buffer) {
> - inline char* Prettify(char* buffer, int length, int k) {
> - const int kk = length + k; // 10^(kk-1) <= v < 10^kk
> -
> -- if (length <= kk && kk <= 21) {
> -+ if (0 <= k && kk <= 21) {
> - // 1234e7 -> 12340000000
> - for (int i = length; i < kk; i++)
> - buffer[i] = '0';
> ---
> -1.9.1
> -
> diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
> index 17164283c..cf3e16ea5 100644
> --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
> +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
> @@ -12,22 +12,29 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> CMakeLists.txt | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 68139ba..cae7c9b 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -26,9 +26,9 @@ if(RAPIDJSON_HAS_STDSTRING)
> - endif()
> +Index: git/CMakeLists.txt
> +===================================================================
> +--- git.orig/CMakeLists.txt
> ++++ git/CMakeLists.txt
> +@@ -51,10 +51,10 @@ endif(CCACHE_FOUND)
>
> if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
> -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
> -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
> - elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
> -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
> -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
> - elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
> - add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
> - endif()
> ---
> -1.9.1
> -
> + if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")
> +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
> ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
> + else()
> + #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
> +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
> ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
> + endif()
> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
> + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
> +@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C
> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
> + else()
> + #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
> +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
> ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
> + endif()
> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
> + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything)
> diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
> similarity index 73%
> rename from meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb
> rename to meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
> index dd6b89698..4cded0720 100644
> --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb
> +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
> @@ -2,20 +2,21 @@ SUMMARY = "A fast JSON parser/generator for C++ with both SAX/DOM style API"
> HOMEPAGE = "http://rapidjson.org/"
> SECTION = "libs"
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://license.txt;md5=cff54e417a17b4b77465198254970cd2"
> +LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
>
> SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \
> file://remove-march-native-from-CMAKE_CXX_FLAGS.patch \
> - file://Fix-gcc-strict-overflow-warning.patch \
> "
>
> -SRCREV = "3d5848a7cd3367c5cb451c6493165b7745948308"
> +SRCREV = "e5635fb27feab7f6e8d7b916aa20ad799045a641"
> +
> +PV = "1.1.0+git${SRCPV}"
>
> S = "${WORKDIR}/git"
>
> inherit cmake
>
> -EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF"
> +EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF"
Did you see an issue building the examples?
If the examples aren't built then
remove-march-native-from-CMAKE_CXX_FLAGS.patch can be dropped.
> # RapidJSON is a header-only C++ library, so the main package will be empty.
>
> --
> 2.12.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH V2 02/16] rapidjson: Update to 1.1.0 + git
2017-03-20 21:30 ` Andre McCurdy
@ 2017-03-20 21:39 ` Khem Raj
0 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-20 21:39 UTC (permalink / raw)
To: Andre McCurdy; +Cc: openembeded-devel
On Mon, Mar 20, 2017 at 2:30 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Sun, Mar 19, 2017 at 10:31 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> Drop backports
>> Adjust the license checksums to match the changes to file especially
>>
>> https://github.com/miloyip/rapidjson/commit/b4b1a39937fbd168ef72ea477f90f626773d56fc
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> .../Fix-gcc-strict-overflow-warning.patch | 30 ----------------
>> .../remove-march-native-from-CMAKE_CXX_FLAGS.patch | 41 +++++++++++++---------
>> .../{rapidjson_1.0.2.bb => rapidjson_git.bb} | 9 ++---
>> 3 files changed, 29 insertions(+), 51 deletions(-)
>> delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
>> rename meta-oe/recipes-devtools/rapidjson/{rapidjson_1.0.2.bb => rapidjson_git.bb} (73%)
>>
>> diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
>> deleted file mode 100644
>> index 6ce3933ce..000000000
>> --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch
>> +++ /dev/null
>> @@ -1,30 +0,0 @@
>> -From f5560d9557ee48fb79810180ddfd3ec386e2a7b5 Mon Sep 17 00:00:00 2001
>> -From: Milo Yip <miloyip@gmail.com>
>> -Date: Wed, 2 Mar 2016 01:01:17 +0800
>> -Subject: [PATCH] Fix gcc strict-overflow warning
>> -
>> -Fix #566 #568
>> -
>> -Upstream-Status: Backport [Partial merge of upstream commit 928caf92e]
>> -
>> -Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
>> ----
>> - include/rapidjson/internal/dtoa.h | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h
>> -index 2d8d2e4..15571e1 100644
>> ---- a/include/rapidjson/internal/dtoa.h
>> -+++ b/include/rapidjson/internal/dtoa.h
>> -@@ -148,7 +148,7 @@ inline char* WriteExponent(int K, char* buffer) {
>> - inline char* Prettify(char* buffer, int length, int k) {
>> - const int kk = length + k; // 10^(kk-1) <= v < 10^kk
>> -
>> -- if (length <= kk && kk <= 21) {
>> -+ if (0 <= k && kk <= 21) {
>> - // 1234e7 -> 12340000000
>> - for (int i = length; i < kk; i++)
>> - buffer[i] = '0';
>> ---
>> -1.9.1
>> -
>> diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
>> index 17164283c..cf3e16ea5 100644
>> --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
>> +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
>> @@ -12,22 +12,29 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
>> CMakeLists.txt | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> -diff --git a/CMakeLists.txt b/CMakeLists.txt
>> -index 68139ba..cae7c9b 100644
>> ---- a/CMakeLists.txt
>> -+++ b/CMakeLists.txt
>> -@@ -26,9 +26,9 @@ if(RAPIDJSON_HAS_STDSTRING)
>> - endif()
>> +Index: git/CMakeLists.txt
>> +===================================================================
>> +--- git.orig/CMakeLists.txt
>> ++++ git/CMakeLists.txt
>> +@@ -51,10 +51,10 @@ endif(CCACHE_FOUND)
>>
>> if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
>> -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
>> -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
>> - elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
>> -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
>> -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
>> - elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
>> - add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
>> - endif()
>> ---
>> -1.9.1
>> -
>> + if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")
>> +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
>> ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
>> + else()
>> + #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
>> +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
>> ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
>> + endif()
>> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
>> + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
>> +@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C
>> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
>> + else()
>> + #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
>> +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
>> ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
>> + endif()
>> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
>> + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything)
>> diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
>> similarity index 73%
>> rename from meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb
>> rename to meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
>> index dd6b89698..4cded0720 100644
>> --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb
>> +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
>> @@ -2,20 +2,21 @@ SUMMARY = "A fast JSON parser/generator for C++ with both SAX/DOM style API"
>> HOMEPAGE = "http://rapidjson.org/"
>> SECTION = "libs"
>> LICENSE = "MIT"
>> -LIC_FILES_CHKSUM = "file://license.txt;md5=cff54e417a17b4b77465198254970cd2"
>> +LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
>>
>> SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \
>> file://remove-march-native-from-CMAKE_CXX_FLAGS.patch \
>> - file://Fix-gcc-strict-overflow-warning.patch \
>> "
>>
>> -SRCREV = "3d5848a7cd3367c5cb451c6493165b7745948308"
>> +SRCREV = "e5635fb27feab7f6e8d7b916aa20ad799045a641"
>> +
>> +PV = "1.1.0+git${SRCPV}"
>>
>> S = "${WORKDIR}/git"
>>
>> inherit cmake
>>
>> -EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF"
>> +EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF"
>
> Did you see an issue building the examples?
>
yes, they do not build for musl, I disabled it in general to keep
metadata common
> If the examples aren't built then
> remove-march-native-from-CMAKE_CXX_FLAGS.patch can be dropped.
>> # RapidJSON is a header-only C++ library, so the main package will be empty.
>>
>> --
>> 2.12.0
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 12/16] picocom: Upgrade to 2.2
2017-03-20 5:31 ` [meta-oe][PATCH 12/16] picocom: Upgrade to 2.2 Khem Raj
@ 2017-03-30 9:45 ` Martin Jansa
2017-03-30 16:37 ` Khem Raj
0 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2017-03-30 9:45 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4241 bytes --]
On Sun, Mar 19, 2017 at 10:31:48PM -0700, Khem Raj wrote:
> Package has moved to github
> License file got some cosmetic changes see
> https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb | 22 ++++++++++++++++++++++
lcdproc doesn't belong here
> meta-oe/recipes-support/picocom/picocom_1.7.bb | 19 -------------------
> meta-oe/recipes-support/picocom/picocom_git.bb | 23 +++++++++++++++++++++++
> 3 files changed, 45 insertions(+), 19 deletions(-)
> create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
> delete mode 100644 meta-oe/recipes-support/picocom/picocom_1.7.bb
> create mode 100644 meta-oe/recipes-support/picocom/picocom_git.bb
>
> diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
> new file mode 100644
> index 000000000..96fbd350b
> --- /dev/null
> +++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb
> @@ -0,0 +1,22 @@
> +require lcdproc5.inc
> +SRC_URI[md5sum] = "2f8e064233ef1d03e98c0b426595750d"
> +SRC_URI[sha256sum] = "843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804"
> +
> +PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
> +PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid"
> +PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"
> +
> +LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
> +
> +do_install_append () {
> + # binaries
> + install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
> +
> + # configuration files
> + install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
> +}
> +
> +PACKAGES =+ "lcdvc"
> +CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
> +FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc"
> +
> diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb
> deleted file mode 100644
> index d2a76c0a9..000000000
> --- a/meta-oe/recipes-support/picocom/picocom_1.7.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
> -SECTION = "console/utils"
> -LICENSE = "GPLv2+"
> -HOMEPAGE = "http://code.google.com/p/picocom/"
> -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=393a5ca445f6965873eca0259a17f833"
> -
> -SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz"
> -
> -SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef"
> -SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e"
> -
> -EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
> - 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
> -
> -do_install () {
> - install -d ${D}${bindir}
> - install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
> -}
> -
> diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb
> new file mode 100644
> index 000000000..e091094cf
> --- /dev/null
> +++ b/meta-oe/recipes-support/picocom/picocom_git.bb
> @@ -0,0 +1,23 @@
> +SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program"
> +SECTION = "console/utils"
> +LICENSE = "GPLv2+"
> +HOMEPAGE = "http://code.google.com/p/picocom/"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"
> +
> +BASEPV = "2.2"
> +PV = "${BASEPV}+git${SRCPV}"
> +
> +SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc"
> +
> +SRC_URI = "git://github.com/npat-efault/picocom"
> +
> +S = "${WORKDIR}/git"
> +
> +EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \
> + 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
> +
> +do_install () {
> + install -d ${D}${bindir}
> + install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/
> +}
> +
> --
> 2.12.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 16/16] libexecinfo: Add recipe
2017-03-20 5:31 ` [meta-oe][PATCH 16/16] libexecinfo: Add recipe Khem Raj
@ 2017-03-30 9:46 ` Martin Jansa
2017-03-30 16:38 ` Khem Raj
0 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2017-03-30 9:46 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 8476 bytes --]
On Sun, Mar 19, 2017 at 10:31:52PM -0700, Khem Raj wrote:
> This package is handy especially with musl to port
> apps which use glibc backtrace APIs
Fails to build here:
http://errors.yoctoproject.org/Errors/Details/138496/
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../0001-makefile-Fix-build-on-linux.patch | 59 ++++++++++++++++
> ...x-compiler-errors-found-with-newer-gcc-cl.patch | 79 ++++++++++++++++++++++
> .../libexecinfo/libexecinfo_1.1.bb | 27 ++++++++
> 3 files changed, 165 insertions(+)
> create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
> create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
> create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
>
> diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
> new file mode 100644
> index 000000000..f1863f14b
> --- /dev/null
> +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
> @@ -0,0 +1,59 @@
> +From 910bbc2cb6cc1cfa6deed9d170da02a639902c7c Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sun, 19 Mar 2017 16:14:54 -0700
> +Subject: [PATCH 1/2] makefile: Fix build on linux
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + Makefile | 33 +++++++++++++++++----------------
> + 1 file changed, 17 insertions(+), 16 deletions(-)
> +
> +Index: libexecinfo-1.1/Makefile
> +===================================================================
> +--- libexecinfo-1.1.orig/Makefile
> ++++ libexecinfo-1.1/Makefile
> +@@ -23,24 +23,25 @@
> + # SUCH DAMAGE.
> + #
> + # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $
> ++#
> ++# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04
> +
> +-LIB= execinfo
> +-
> +-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h
> +-
> +-INCS= execinfo.h
> +-
> +-SHLIB_MAJOR= 1
> +-SHLIB_MINOR= 0
> +-
> +-NOPROFILE= yes
> +-
> +-DPADD= ${LIBM}
> +-LDADD= -lm
> +-
> +-#WARNS?= 4
> +-
> +-#stacktraverse.c: gen.py
> +-# ./gen.py > stacktraverse.c
> ++CC?=cc
> ++AR?=ar
> ++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c
> ++EXECINFO_LDFLAGS=$(LDFLAGS)
> ++
> ++all: static dynamic
> ++
> ++static:
> ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c
> ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c
> ++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o
> ++
> ++dynamic:
> ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So
> ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So
> ++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 $(EXECINFO_LDFLAGS) stacktraverse.So execinfo.So
> +
> +-.include <bsd.lib.mk>
> ++clean:
> ++ rm -rf *.o *.So *.a *.so
> diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
> new file mode 100644
> index 000000000..423b67082
> --- /dev/null
> +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
> @@ -0,0 +1,79 @@
> +From 0810817773fb81d7383d2fa8464244c8f79845fb Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sun, 19 Mar 2017 16:16:18 -0700
> +Subject: [PATCH 2/2] execinfo: Fix compiler errors found with newer gcc/clang
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + execinfo.c | 19 +++++++++++--------
> + 1 file changed, 11 insertions(+), 8 deletions(-)
> +
> +diff --git a/execinfo.c b/execinfo.c
> +index 906fb14..9448b60 100644
> +--- a/execinfo.c
> ++++ b/execinfo.c
> +@@ -69,7 +69,8 @@ backtrace(void **buffer, int size)
> + char **
> + backtrace_symbols(void *const *buffer, int size)
> + {
> +- int i, clen, alen, offset;
> ++ size_t clen, alen;
> ++ int i, offset;
> + char **rval;
> + char *cp;
> + Dl_info info;
> +@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size)
> + rval = malloc(clen);
> + if (rval == NULL)
> + return NULL;
> +- (char **)cp = &(rval[size]);
> + for (i = 0; i < size; i++) {
> + if (dladdr(buffer[i], &info) != 0) {
> + if (info.dli_sname == NULL)
> +@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size)
> + 2 + /* " <" */
> + strlen(info.dli_sname) + /* "function" */
> + 1 + /* "+" */
> +- D10(offset) + /* "offset */
> ++ 10 + /* "offset */
> + 5 + /* "> at " */
> + strlen(info.dli_fname) + /* "filename" */
> + 1; /* "\0" */
> + rval = realloc_safe(rval, clen + alen);
> + if (rval == NULL)
> + return NULL;
> +- snprintf(cp, alen, "%p <%s+%d> at %s",
> ++ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
> + buffer[i], info.dli_sname, offset, info.dli_fname);
> + } else {
> + alen = 2 + /* "0x" */
> +@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, int size)
> + rval = realloc_safe(rval, clen + alen);
> + if (rval == NULL)
> + return NULL;
> +- snprintf(cp, alen, "%p", buffer[i]);
> ++ snprintf((char *) rval + clen, alen, "%p", buffer[i]);
> + }
> +- rval[i] = cp;
> +- cp += alen;
> ++ rval[i] = (char *) clen;
> ++ clen += alen;
> + }
> +
> ++ for (i = 0; i < size; i++)
> ++ rval[i] += (long) rval;
> ++
> + return rval;
> + }
> +
> +@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd)
> + return;
> + snprintf(buf, len, "%p\n", buffer[i]);
> + }
> +- write(fd, buf, len - 1);
> ++ write(fd, buf, strlen(buf));
> + }
> + }
> +--
> +2.12.0
> +
> diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
> new file mode 100644
> index 000000000..48d14dd62
> --- /dev/null
> +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
> @@ -0,0 +1,27 @@
> +# Copyright (C) 2017 Khem Raj <raj.khem@gmail.com>
> +# Released under the MIT license (see COPYING.MIT for the terms)
> +
> +DESCRIPTION = "A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility."
> +HOMEPAGE = "http://www.freshports.org/devel/libexecinfo"
> +LIC_FILES_CHKSUM = "file://execinfo.c;endline=25;md5=85bd3fa4ea9acae5182e29db063fe2e5"
> +LICENSE = "BSD-2-Clause"
> +SECTION = "libs"
> +DEPENDS = ""
> +
> +SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \
> + file://0001-makefile-Fix-build-on-linux.patch \
> + file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \
> + "
> +SRC_URI[md5sum] = "8e9e81c554c1c5d735bc877448e92b91"
> +SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f"
> +
> +CFLAGS += "-fno-omit-frame-pointer"
> +
> +do_install() {
> + install -D -m 0744 ${S}/execinfo.h ${D}${includedir}/execinfo.h
> + install -D -m 0744 ${S}/stacktraverse.h ${D}${includedir}/stacktraverse.h
> + install -D -m 0744 ${B}/libexecinfo.a ${D}${libdir}/libexecinfo.a
> + install -D -m 0755 ${B}/libexecinfo.so.1 ${D}${libdir}/libexecinfo.so.1
> + ln -s libexecinfo.so.1 ${D}${libdir}/libexecinfo.so
> +}
> +
> --
> 2.12.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 12/16] picocom: Upgrade to 2.2
2017-03-30 9:45 ` Martin Jansa
@ 2017-03-30 16:37 ` Khem Raj
0 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-30 16:37 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
[-- Attachment #1.1: Type: text/plain, Size: 518 bytes --]
On 3/30/17 2:45 AM, Martin Jansa wrote:
> On Sun, Mar 19, 2017 at 10:31:48PM -0700, Khem Raj wrote:
>> Package has moved to github
>> License file got some cosmetic changes see
>> https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> meta-oe/recipes-extended/lcdproc/lcdproc_0.5.7.bb | 22 ++++++++++++++++++++++
>
> lcdproc doesn't belong here
Squash gone wrong. Drop it for now, coming in new pull.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 16/16] libexecinfo: Add recipe
2017-03-30 9:46 ` Martin Jansa
@ 2017-03-30 16:38 ` Khem Raj
0 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2017-03-30 16:38 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
[-- Attachment #1.1: Type: text/plain, Size: 373 bytes --]
On 3/30/17 2:46 AM, Martin Jansa wrote:
> On Sun, Mar 19, 2017 at 10:31:52PM -0700, Khem Raj wrote:
>> This package is handy especially with musl to port
>> apps which use glibc backtrace APIs
> Fails to build here:
> http://errors.yoctoproject.org/Errors/Details/138496/
>
This should be made musl-only package. Fixed locally will
resend with next pull.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2017-03-30 16:38 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-20 5:31 [meta-oe][PATCH V2 01/16] gpm: Update to use git src uri Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH V2 02/16] rapidjson: Update to 1.1.0 + git Khem Raj
2017-03-20 21:30 ` Andre McCurdy
2017-03-20 21:39 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH V2 03/16] libtorrent, rtorrent: Update to latest Khem Raj
2017-03-20 5:31 ` [meta-xfce][PATCH V2 04/16] core-image-minimal-xfce: Drop ROOTFS_PKGMANAGE_BOOTSTRAP Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 05/16] sgio: Fix missing GNU_HASH errors Khem Raj
2017-03-20 5:31 ` [meta-multimedia][PATCH 06/16] libmatroska: " Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 07/16] smstools3: Fix " Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 08/16] procmail: Fix GNU_HASH errors, pass LDFLAGS Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 09/16] gradm: Fix GNU_HASH QA errors Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 10/16] zile: Fix build with musl Khem Raj
2017-03-20 5:31 ` [meta-networking][PATCH 11/16] libmemcached: Upgrade to 1.0.18 Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 12/16] picocom: Upgrade to 2.2 Khem Raj
2017-03-30 9:45 ` Martin Jansa
2017-03-30 16:37 ` Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 13/16] samsung-soc-utils: Remove -static Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 14/16] digitemp: Update past 3.7.1 release Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 15/16] memstat: Fix build with musl Khem Raj
2017-03-20 5:31 ` [meta-oe][PATCH 16/16] libexecinfo: Add recipe Khem Raj
2017-03-30 9:46 ` Martin Jansa
2017-03-30 16:38 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.