* [meta-oe][PATCH] hplip: Fix build with clang
@ 2016-12-16 22:10 Khem Raj
2016-12-20 12:34 ` Martin Jansa
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2016-12-16 22:10 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...de-cups-ppd.h-for-missing-ppd-definitions.patch | 42 ++++++++++++++++++++++
meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | 1 +
2 files changed, 43 insertions(+)
create mode 100644 meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
new file mode 100644
index 0000000..f259b5f
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
@@ -0,0 +1,42 @@
+From 7ef9c040dd959105c16d4dc67e14f3bbea25e77f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 16 Dec 2016 19:51:19 +0000
+Subject: [PATCH] include cups/ppd.h for missing ppd definitions
+
+Fixes errors spotted by clang
+
+| prnt/hpcups/HPCupsFilter.cpp:365:18: error: use of undeclared identifier 'ppdFindAttr'
+| if (((attr = ppdFindAttr(m_ppd, "hpPrinterLanguage", NULL)) == NULL) ||
+| ^
+| prnt/hpcups/HPCupsFilter.cpp:368:13: error: use of undeclared identifier 'ppdClose'
+| ppdClose(m_ppd);
+| ^
+| prnt/hpcups/HPCupsFilter.cpp:444:9: error: use of undeclared identifier 'ppdClose'
+| ppdClose(m_ppd);
+| ^
+| prnt/hpcups/HPCupsFilter.cpp:497:13: error: use of undeclared identifier 'ppdOpenFile'
+| m_ppd = ppdOpenFile(getenv("PPD"));
+| ^
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Pending
+
+ prnt/hpcups/HPCupsFilter.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index 0431a7a..eb0cad6 100644
+--- a/prnt/hpcups/HPCupsFilter.h
++++ b/prnt/hpcups/HPCupsFilter.h
+@@ -37,6 +37,7 @@
+ #include "Job.h"
+
+ #include "dbuscomm.h"
++#include <cups/ppd.h>
+
+ #define DBITMAPFILEHEADER 14
+ #define DBITMAPINFOHEADER 40
+--
+1.9.1
+
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
index 9848e5a..1f1e80c 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
@@ -9,6 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
file://fix-libusb-paths.patch \
file://cups-1.6.patch \
file://configure.patch \
+ file://0001-include-cups-ppd.h-for-missing-ppd-definitions.patch \
"
DEPENDS += "cups python libusb"
--
2.10.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [meta-oe][PATCH] hplip: Fix build with clang
2016-12-16 22:10 [meta-oe][PATCH] hplip: Fix build with clang Khem Raj
@ 2016-12-20 12:34 ` Martin Jansa
2016-12-21 6:04 ` Khem Raj
2016-12-21 10:38 ` Martin Jansa
0 siblings, 2 replies; 4+ messages in thread
From: Martin Jansa @ 2016-12-20 12:34 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3424 bytes --]
On Fri, Dec 16, 2016 at 02:10:33PM -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> ...de-cups-ppd.h-for-missing-ppd-definitions.patch | 42 ++++++++++++++++++++++
> meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | 1 +
> 2 files changed, 43 insertions(+)
> create mode 100644 meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
>
> diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
> new file mode 100644
> index 0000000..f259b5f
> --- /dev/null
> +++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
> @@ -0,0 +1,42 @@
> +From 7ef9c040dd959105c16d4dc67e14f3bbea25e77f Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Fri, 16 Dec 2016 19:51:19 +0000
> +Subject: [PATCH] include cups/ppd.h for missing ppd definitions
> +
> +Fixes errors spotted by clang
> +
> +| prnt/hpcups/HPCupsFilter.cpp:365:18: error: use of undeclared identifier 'ppdFindAttr'
> +| if (((attr = ppdFindAttr(m_ppd, "hpPrinterLanguage", NULL)) == NULL) ||
> +| ^
> +| prnt/hpcups/HPCupsFilter.cpp:368:13: error: use of undeclared identifier 'ppdClose'
> +| ppdClose(m_ppd);
> +| ^
> +| prnt/hpcups/HPCupsFilter.cpp:444:9: error: use of undeclared identifier 'ppdClose'
> +| ppdClose(m_ppd);
> +| ^
> +| prnt/hpcups/HPCupsFilter.cpp:497:13: error: use of undeclared identifier 'ppdOpenFile'
> +| m_ppd = ppdOpenFile(getenv("PPD"));
> +| ^
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> +Upstream-Status: Pending
> +
> + prnt/hpcups/HPCupsFilter.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
> +index 0431a7a..eb0cad6 100644
> +--- a/prnt/hpcups/HPCupsFilter.h
> ++++ b/prnt/hpcups/HPCupsFilter.h
> +@@ -37,6 +37,7 @@
> + #include "Job.h"
> +
> + #include "dbuscomm.h"
> ++#include <cups/ppd.h>
> +
> + #define DBITMAPFILEHEADER 14
> + #define DBITMAPINFOHEADER 40
> +--
> +1.9.1
> +
> diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
> index 9848e5a..1f1e80c 100644
> --- a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
> +++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
> @@ -9,6 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
> file://fix-libusb-paths.patch \
> file://cups-1.6.patch \
> file://configure.patch \
> + file://0001-include-cups-ppd.h-for-missing-ppd-definitions.patch \
> "
It failed to build even without clang (when using default toolchain),
but this patch fails to apply:
http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161218_140914.log//2_max/failed/hplip.log
>
> DEPENDS += "cups python libusb"
> --
> 2.10.2
>
> --
> _______________________________________________
> 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] 4+ messages in thread* Re: [meta-oe][PATCH] hplip: Fix build with clang
2016-12-20 12:34 ` Martin Jansa
@ 2016-12-21 6:04 ` Khem Raj
2016-12-21 10:38 ` Martin Jansa
1 sibling, 0 replies; 4+ messages in thread
From: Khem Raj @ 2016-12-21 6:04 UTC (permalink / raw)
To: openembeded-devel
On Tue, Dec 20, 2016 at 4:34 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Dec 16, 2016 at 02:10:33PM -0800, Khem Raj wrote:
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> ...de-cups-ppd.h-for-missing-ppd-definitions.patch | 42 ++++++++++++++++++++++
>> meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | 1 +
>> 2 files changed, 43 insertions(+)
>> create mode 100644 meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
>>
>> diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
>> new file mode 100644
>> index 0000000..f259b5f
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
>> @@ -0,0 +1,42 @@
>> +From 7ef9c040dd959105c16d4dc67e14f3bbea25e77f Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Fri, 16 Dec 2016 19:51:19 +0000
>> +Subject: [PATCH] include cups/ppd.h for missing ppd definitions
>> +
>> +Fixes errors spotted by clang
>> +
>> +| prnt/hpcups/HPCupsFilter.cpp:365:18: error: use of undeclared identifier 'ppdFindAttr'
>> +| if (((attr = ppdFindAttr(m_ppd, "hpPrinterLanguage", NULL)) == NULL) ||
>> +| ^
>> +| prnt/hpcups/HPCupsFilter.cpp:368:13: error: use of undeclared identifier 'ppdClose'
>> +| ppdClose(m_ppd);
>> +| ^
>> +| prnt/hpcups/HPCupsFilter.cpp:444:9: error: use of undeclared identifier 'ppdClose'
>> +| ppdClose(m_ppd);
>> +| ^
>> +| prnt/hpcups/HPCupsFilter.cpp:497:13: error: use of undeclared identifier 'ppdOpenFile'
>> +| m_ppd = ppdOpenFile(getenv("PPD"));
>> +| ^
>> +
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> +---
>> +Upstream-Status: Pending
>> +
>> + prnt/hpcups/HPCupsFilter.h | 1 +
>> + 1 file changed, 1 insertion(+)
>> +
>> +diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
>> +index 0431a7a..eb0cad6 100644
>> +--- a/prnt/hpcups/HPCupsFilter.h
>> ++++ b/prnt/hpcups/HPCupsFilter.h
>> +@@ -37,6 +37,7 @@
>> + #include "Job.h"
>> +
>> + #include "dbuscomm.h"
>> ++#include <cups/ppd.h>
>> +
>> + #define DBITMAPFILEHEADER 14
>> + #define DBITMAPINFOHEADER 40
>> +--
>> +1.9.1
>> +
>> diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
>> index 9848e5a..1f1e80c 100644
>> --- a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
>> +++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
>> @@ -9,6 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
>> file://fix-libusb-paths.patch \
>> file://cups-1.6.patch \
>> file://configure.patch \
>> + file://0001-include-cups-ppd.h-for-missing-ppd-definitions.patch \
>> "
>
> It failed to build even without clang (when using default toolchain),
> but this patch fails to apply:
>
> http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161218_140914.log//2_max/failed/hplip.log
This has to do with line endings, I guess patch program on your builder is
not happy about the CR-LF endings. I have sent another patch, where I
do not introduce new empty lines. Lets see if this one applies ok.
>
>>
>> DEPENDS += "cups python libusb"
>> --
>> 2.10.2
>>
>> --
>> _______________________________________________
>> 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
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [meta-oe][PATCH] hplip: Fix build with clang
2016-12-20 12:34 ` Martin Jansa
2016-12-21 6:04 ` Khem Raj
@ 2016-12-21 10:38 ` Martin Jansa
1 sibling, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2016-12-21 10:38 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3927 bytes --]
On Tue, Dec 20, 2016 at 01:34:46PM +0100, Martin Jansa wrote:
> On Fri, Dec 16, 2016 at 02:10:33PM -0800, Khem Raj wrote:
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > ...de-cups-ppd.h-for-missing-ppd-definitions.patch | 42 ++++++++++++++++++++++
> > meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | 1 +
> > 2 files changed, 43 insertions(+)
> > create mode 100644 meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
> >
> > diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
> > new file mode 100644
> > index 0000000..f259b5f
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
> > @@ -0,0 +1,42 @@
> > +From 7ef9c040dd959105c16d4dc67e14f3bbea25e77f Mon Sep 17 00:00:00 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Fri, 16 Dec 2016 19:51:19 +0000
> > +Subject: [PATCH] include cups/ppd.h for missing ppd definitions
> > +
> > +Fixes errors spotted by clang
> > +
> > +| prnt/hpcups/HPCupsFilter.cpp:365:18: error: use of undeclared identifier 'ppdFindAttr'
> > +| if (((attr = ppdFindAttr(m_ppd, "hpPrinterLanguage", NULL)) == NULL) ||
> > +| ^
> > +| prnt/hpcups/HPCupsFilter.cpp:368:13: error: use of undeclared identifier 'ppdClose'
> > +| ppdClose(m_ppd);
> > +| ^
> > +| prnt/hpcups/HPCupsFilter.cpp:444:9: error: use of undeclared identifier 'ppdClose'
> > +| ppdClose(m_ppd);
> > +| ^
> > +| prnt/hpcups/HPCupsFilter.cpp:497:13: error: use of undeclared identifier 'ppdOpenFile'
> > +| m_ppd = ppdOpenFile(getenv("PPD"));
> > +| ^
> > +
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +---
> > +Upstream-Status: Pending
> > +
> > + prnt/hpcups/HPCupsFilter.h | 1 +
> > + 1 file changed, 1 insertion(+)
> > +
> > +diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
> > +index 0431a7a..eb0cad6 100644
> > +--- a/prnt/hpcups/HPCupsFilter.h
> > ++++ b/prnt/hpcups/HPCupsFilter.h
> > +@@ -37,6 +37,7 @@
> > + #include "Job.h"
> > +
> > + #include "dbuscomm.h"
> > ++#include <cups/ppd.h>
> > +
> > + #define DBITMAPFILEHEADER 14
> > + #define DBITMAPINFOHEADER 40
> > +--
> > +1.9.1
> > +
> > diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
> > index 9848e5a..1f1e80c 100644
> > --- a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
> > +++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
> > @@ -9,6 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
> > file://fix-libusb-paths.patch \
> > file://cups-1.6.patch \
> > file://configure.patch \
> > + file://0001-include-cups-ppd.h-for-missing-ppd-definitions.patch \
> > "
>
> It failed to build even without clang (when using default toolchain),
> but this patch fails to apply:
>
> http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161218_140914.log//2_max/failed/hplip.log
I've cherry-picked this directly from you branch and it fixed the line
endings in the patch and might fix to application of the .patch, lets
see if it fixes also the build with default toolchain.
>
> >
> > DEPENDS += "cups python libusb"
> > --
> > 2.10.2
> >
> > --
> > _______________________________________________
> > 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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-12-21 10:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-16 22:10 [meta-oe][PATCH] hplip: Fix build with clang Khem Raj
2016-12-20 12:34 ` Martin Jansa
2016-12-21 6:04 ` Khem Raj
2016-12-21 10:38 ` Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox