| Submitter | Colin Walters |
|---|---|
| Date | Jan. 17, 2012, 3:09 p.m. |
| Message ID | <1326812944.3467.46.camel@lenny> |
| Download | mbox | patch |
| Permalink | /patch/19583/ |
| State | New |
| Headers | show |
Comments
Op 17 jan. 2012, om 16:09 heeft Colin Walters het volgende geschreven: > On Sun, 2012-01-15 at 20:11 -0800, Saul Wold wrote: >> On 01/15/2012 10:13 AM, Colin Walters wrote: >>> See attached. >>> >>> >> The current version is 2.4.2 and this requires a PR bump. > > Hm, do you want a new patch that bumps the PR? What are the rules for > when a PR should be incremented? > >> Also, can you use "git send-email" directly instead of sending the patch >> as an attachment, when sent that way, it requires extra steps to edit >> the file before applying. > > Ah...the problem is that I'd have to teach git-send-email how to > authenticate to my mail server which isn't trivial. Would a workflow > where I paste the patch inline (thus creating whitespace damage), but > also link to my github mirror work? Let's try it with a new patch: > > https://github.com/cgwalters/poky/commit/0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf FWIW http://cgit.openembedded.org/openembedded-core/commit/?id=e1312eef88cb0f3f1557d431f0b31520b2a9968e attempts to fix that, but your solution is cleaner
On 01/17/2012 07:09 AM, Colin Walters wrote: > On Sun, 2012-01-15 at 20:11 -0800, Saul Wold wrote: >> On 01/15/2012 10:13 AM, Colin Walters wrote: >>> See attached. >>> >>> >> The current version is 2.4.2 and this requires a PR bump. > > Hm, do you want a new patch that bumps the PR? What are the rules for > when a PR should be incremented? > No, I updated your patch for 2.4.2. The PR bumps required if the output of a package is going to change or a dependee needs to get rebuilt due to the change. Other than comments changing it's commonly required. >> Also, can you use "git send-email" directly instead of sending the patch >> as an attachment, when sent that way, it requires extra steps to edit >> the file before applying. > > Ah...the problem is that I'd have to teach git-send-email how to > authenticate to my mail server which isn't trivial. Would a workflow > where I paste the patch inline (thus creating whitespace damage), but > also link to my github mirror work? Let's try it with a new patch: > > https://github.com/cgwalters/poky/commit/0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf > Yes, this will work better in the future, let me know the github branch that contains your patch against oe-core or poky master (which ever you prefer). Thanks Sau! >> From 0255ac2e95bb5230f7fdf1b861be0b97b01f2ecf Mon Sep 17 00:00:00 2001 > From: Colin Walters<walters@verbum.org> > Date: Tue, 17 Jan 2012 09:06:28 -0500 > Subject: [PATCH] zlib: Build and install zlib.pc > > Poky has a fork of the zlib build system which presently installs > headers and the shared library, but neglects the zlib.pc file. > Several components (e.g. glib, WebKitGtk) look for this, so let's > provide it. > --- > meta/recipes-core/zlib/files/Makefile.am | 3 +++ > meta/recipes-core/zlib/files/configure.ac | 3 ++- > 2 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-core/zlib/files/Makefile.am > b/meta/recipes-core/zlib/files/Makefile.am > index b66d299..0458892 100644 > --- a/meta/recipes-core/zlib/files/Makefile.am > +++ b/meta/recipes-core/zlib/files/Makefile.am > @@ -7,3 +7,6 @@ libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c > gzclose.c gzread.c \ > libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map > > include_HEADERS = zconf.h zlib.h zlibdefs.h > + > +pkgconfigdir = ${libdir}/pkgconfig > +pkgconfig_DATA = zlib.pc > diff --git a/meta/recipes-core/zlib/files/configure.ac > b/meta/recipes-core/zlib/files/configure.ac > index 4761b7e..5698175 100644 > --- a/meta/recipes-core/zlib/files/configure.ac > +++ b/meta/recipes-core/zlib/files/configure.ac > @@ -43,6 +43,7 @@ cat> zlibdefs.h<< EOF > #endif > EOF > > -AC_CONFIG_FILES([Makefile]) > +AC_CONFIG_FILES([Makefile > + zlib.pc]) > > AC_OUTPUT
Patch
diff --git a/meta/recipes-core/zlib/files/Makefile.am b/meta/recipes-core/zlib/files/Makefile.am index b66d299..0458892 100644 --- a/meta/recipes-core/zlib/files/Makefile.am +++ b/meta/recipes-core/zlib/files/Makefile.am @@ -7,3 +7,6 @@ libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c gzclose.c gzread.c \ libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map include_HEADERS = zconf.h zlib.h zlibdefs.h + +pkgconfigdir = ${libdir}/pkgconfig +pkgconfig_DATA = zlib.pc diff --git a/meta/recipes-core/zlib/files/configure.ac b/meta/recipes-core/zlib/files/configure.ac index 4761b7e..5698175 100644 --- a/meta/recipes-core/zlib/files/configure.ac +++ b/meta/recipes-core/zlib/files/configure.ac @@ -43,6 +43,7 @@ cat > zlibdefs.h << EOF #endif EOF -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile + zlib.pc]) AC_OUTPUT