| Message ID | 1447983556-28274-1-git-send-email-ryanbarnett3@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
On 20-11-15 02:39, Ryan Barnett wrote: > To fix issues with compiling with GCC 5.x, switch to utilzing the > debian patches for cross compiling. The debian tar was tired but the > series file in the folder is not compatiable with buildroot as it has > a 'p1' after each file. Peter merged 7caf46439 (apply-patches.sh: use everything from the series file) so this should no longer be the case. Could you give it another go? > This means the patches are individually > listed. > > Fixes: > http://autobuild.buildroot.net/results/150/150fa803fc3b65f75dce2847907ee768fc94c7a7 > http://autobuild.buildroot.net/results/150/150fa803fc3b65f75dce2847907ee768fc94c7a7 > ...and many more > > Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com> > --- > .../ustr/0001-cross-compile-modifications.patch | 144 --------------------- > package/ustr/ustr.hash | 6 + > package/ustr/ustr.mk | 50 ++----- > 3 files changed, 16 insertions(+), 184 deletions(-) > delete mode 100644 package/ustr/0001-cross-compile-modifications.patch > > diff --git a/package/ustr/0001-cross-compile-modifications.patch b/package/ustr/0001-cross-compile-modifications.patch > deleted file mode 100644 > index ab75b44..0000000 > --- a/package/ustr/0001-cross-compile-modifications.patch > +++ /dev/null > @@ -1,144 +0,0 @@ > -Changes are to allow ustr version 1.0.4 to cross compile in buildroot. Commit log should explicitly mention that this patch (or an equivalent) is part of the debian patches. If the debian patch is different, also mention explicitly what the difference is. > - > -Signed-off-by Clayton Shotwell <clshotwe@rockwellcollins.com> > - [snip] > diff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk > index 3144c0b..0daed3f 100644 > --- a/package/ustr/ustr.mk > +++ b/package/ustr/ustr.mk > @@ -9,46 +9,16 @@ USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2 > USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION) > USTR_LICENSE = BSD-2c MIT LGPLv2+ > USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT > +USTR_AUTORECONF = YES > +USTR_PATCH = \ > + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/autoconf.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ > + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/doc-html-local-css.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ > + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/gnu-inline.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ > + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/nonlinux.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ > + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/stdarg-va_copy.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ > + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/unused-vars.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > > USTR_INSTALL_STAGING = YES > > -ifeq ($(BR2_STATIC_LIBS),y) > -USTR_BUILD_TARGETS = all > -USTR_INSTALL_TARGETS = install > -else ifeq ($(BR2_SHARED_LIBS),y) > -USTR_BUILD_TARGETS = all-shared > -USTR_INSTALL_TARGETS = install-shared > -else > -USTR_BUILD_TARGETS = all all-shared > -USTR_INSTALL_TARGETS = all install-shared > -endif > - > -define USTR_BUILD_CMDS > - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(USTR_BUILD_TARGETS) > -endef > - > -define USTR_INSTALL_STAGING_CMDS > - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ > - $(USTR_INSTALL_TARGETS) > - $(RM) -f $(STAGING_DIR)/usr/lib/libustr-debug* > - $(RM) -f $(STAGING_DIR)/usr/lib/pkgconfig/libustr-debug.pc > -endef > - > -define USTR_INSTALL_TARGET_CMDS > - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ > - $(USTR_INSTALL_TARGETS) > - $(RM) -f $(TARGET_DIR)/usr/lib/libustr-debug* > - $(RM) -rf $(TARGET_DIR)/usr/share/ustr-$(USTR_VERSION) > -endef > - > -define HOST_USTR_BUILD_CMDS > - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) all-shared > -endef > - > -define HOST_USTR_INSTALL_CMDS > - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) \ > - install-shared > -endef > - > -$(eval $(generic-package)) > -$(eval $(host-generic-package)) > +$(eval $(autotools-package)) > +$(eval $(host-autotools-package)) Wow, so there's a Debian patch that converts it into an autotools package? That's definitely worth mentioning explicitly in the commit log. Regards, Arnout >
Dear Arnout and Ryan, I have just prepared a patch to fix this problem. It is just a matter of passing -std=gnu89 to CFLAGS. That's because GCC5 defaults to gnu11 and handles "inline" constructs differently. Do you want me to send this patch or are you going to apply the Debian patches? Regards, Sergio Prado Embedded Labworks Office: +55 11 2628-3461 Mobile: +55 11 97123-3420 2015-11-20 19:39 GMT-02:00 Arnout Vandecappelle <arnout@mind.be>: > On 20-11-15 02:39, Ryan Barnett wrote: > > To fix issues with compiling with GCC 5.x, switch to utilzing the > > debian patches for cross compiling. The debian tar was tired but the > > series file in the folder is not compatiable with buildroot as it has > > a 'p1' after each file. > > Peter merged 7caf46439 (apply-patches.sh: use everything from the series > file) > so this should no longer be the case. Could you give it another go? > > > This means the patches are individually > > listed. > > > > Fixes: > > > http://autobuild.buildroot.net/results/150/150fa803fc3b65f75dce2847907ee768fc94c7a7 > > > http://autobuild.buildroot.net/results/150/150fa803fc3b65f75dce2847907ee768fc94c7a7 > > ...and many more > > > > Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com> > > --- > > .../ustr/0001-cross-compile-modifications.patch | 144 > --------------------- > > package/ustr/ustr.hash | 6 + > > package/ustr/ustr.mk | 50 ++----- > > 3 files changed, 16 insertions(+), 184 deletions(-) > > delete mode 100644 package/ustr/0001-cross-compile-modifications.patch > > > > diff --git a/package/ustr/0001-cross-compile-modifications.patch > b/package/ustr/0001-cross-compile-modifications.patch > > deleted file mode 100644 > > index ab75b44..0000000 > > --- a/package/ustr/0001-cross-compile-modifications.patch > > +++ /dev/null > > @@ -1,144 +0,0 @@ > > -Changes are to allow ustr version 1.0.4 to cross compile in buildroot. > > Commit log should explicitly mention that this patch (or an equivalent) > is part > of the debian patches. If the debian patch is different, also mention > explicitly > what the difference is. > > > - > > -Signed-off-by Clayton Shotwell <clshotwe@rockwellcollins.com> > > - > [snip] > > diff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk > > index 3144c0b..0daed3f 100644 > > --- a/package/ustr/ustr.mk > > +++ b/package/ustr/ustr.mk > > @@ -9,46 +9,16 @@ USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2 > > USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION) > > USTR_LICENSE = BSD-2c MIT LGPLv2+ > > USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT > > +USTR_AUTORECONF = YES > > +USTR_PATCH = \ > > + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/autoconf.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > > + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/doc-html-local-css.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > > + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/gnu-inline.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > > + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/nonlinux.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > > + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/stdarg-va_copy.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > > + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/unused-vars.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > > > > USTR_INSTALL_STAGING = YES > > > > -ifeq ($(BR2_STATIC_LIBS),y) > > -USTR_BUILD_TARGETS = all > > -USTR_INSTALL_TARGETS = install > > -else ifeq ($(BR2_SHARED_LIBS),y) > > -USTR_BUILD_TARGETS = all-shared > > -USTR_INSTALL_TARGETS = install-shared > > -else > > -USTR_BUILD_TARGETS = all all-shared > > -USTR_INSTALL_TARGETS = all install-shared > > -endif > > - > > -define USTR_BUILD_CMDS > > - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(USTR_BUILD_TARGETS) > > -endef > > - > > -define USTR_INSTALL_STAGING_CMDS > > - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ > > - $(USTR_INSTALL_TARGETS) > > - $(RM) -f $(STAGING_DIR)/usr/lib/libustr-debug* > > - $(RM) -f $(STAGING_DIR)/usr/lib/pkgconfig/libustr-debug.pc > > -endef > > - > > -define USTR_INSTALL_TARGET_CMDS > > - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ > > - $(USTR_INSTALL_TARGETS) > > - $(RM) -f $(TARGET_DIR)/usr/lib/libustr-debug* > > - $(RM) -rf $(TARGET_DIR)/usr/share/ustr-$(USTR_VERSION) > > -endef > > - > > -define HOST_USTR_BUILD_CMDS > > - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) all-shared > > -endef > > - > > -define HOST_USTR_INSTALL_CMDS > > - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) \ > > - install-shared > > -endef > > - > > -$(eval $(generic-package)) > > -$(eval $(host-generic-package)) > > +$(eval $(autotools-package)) > > +$(eval $(host-autotools-package)) > > Wow, so there's a Debian patch that converts it into an autotools package? > That's definitely worth mentioning explicitly in the commit log. > > Regards, > Arnout > > > > > > -- > Arnout Vandecappelle arnout at mind be > Senior Embedded Software Architect +32-16-286500 > Essensium/Mind http://www.mind.be > G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven > LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle > GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot >
Hi Arnount, On Fri, Nov 20, 2015 at 3:39 PM, Arnout Vandecappelle <arnout@mind.be> wrote: > On 20-11-15 02:39, Ryan Barnett wrote: >> To fix issues with compiling with GCC 5.x, switch to utilzing the >> debian patches for cross compiling. The debian tar was tired but the >> series file in the folder is not compatiable with buildroot as it has >> a 'p1' after each file. > > Peter merged 7caf46439 (apply-patches.sh: use everything from the series file) > so this should no longer be the case. Could you give it another go? When trying to use the Debian tar found here: http://http.debian.net/debian/pool/main/u/ustr/ustr_1.0.4-5.debian.tar.xz The following error occurs: Applying -p1 using series: Error: missing patch file /opt/project/tmp/150fa803fc3b65f75dce2847907ee768fc94c7a7/output/build/ustr-1.0.4/.patches-ustr_1.0.4-5.debian.tar.xz-unpacked/debian/patches/-p1 make[1]: *** [/opt/project/tmp/150fa803fc3b65f75dce2847907ee768fc94c7a7/output/build/ustr-1.0.4/.stamp_patched] Error 1 This is due to the fact that the series file is as follows fixes/autoconf.diff -p1 fixes/doc-html-local-css.diff -p1 fixes/gnu-inline.diff -p1 fixes/man-cleanup.diff -p1 fixes/man-spelling.diff -p1 fixes/nonlinux.diff -p1 fixes/stdarg-va_copy.diff -p1 fixes/unused-vars.diff -p1 Any ideas on how to handle this? I'm using the latest master: 90d6fe5ae093438514ddee8bd68ca2b08a336eac >> diff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk >> index 3144c0b..0daed3f 100644 >> --- a/package/ustr/ustr.mk >> +++ b/package/ustr/ustr.mk >> @@ -9,46 +9,16 @@ USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2 >> USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION) >> USTR_LICENSE = BSD-2c MIT LGPLv2+ >> USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT >> +USTR_AUTORECONF = YES >> +USTR_PATCH = \ >> + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/autoconf.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ >> + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/doc-html-local-css.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ >> + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/gnu-inline.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ >> + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/nonlinux.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ >> + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/stdarg-va_copy.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ >> + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/unused-vars.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 >> >> USTR_INSTALL_STAGING = YES >> >> -ifeq ($(BR2_STATIC_LIBS),y) >> -USTR_BUILD_TARGETS = all >> -USTR_INSTALL_TARGETS = install >> -else ifeq ($(BR2_SHARED_LIBS),y) >> -USTR_BUILD_TARGETS = all-shared >> -USTR_INSTALL_TARGETS = install-shared >> -else >> -USTR_BUILD_TARGETS = all all-shared >> -USTR_INSTALL_TARGETS = all install-shared >> -endif >> - >> -define USTR_BUILD_CMDS >> - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(USTR_BUILD_TARGETS) >> -endef >> - >> -define USTR_INSTALL_STAGING_CMDS >> - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ >> - $(USTR_INSTALL_TARGETS) >> - $(RM) -f $(STAGING_DIR)/usr/lib/libustr-debug* >> - $(RM) -f $(STAGING_DIR)/usr/lib/pkgconfig/libustr-debug.pc >> -endef >> - >> -define USTR_INSTALL_TARGET_CMDS >> - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ >> - $(USTR_INSTALL_TARGETS) >> - $(RM) -f $(TARGET_DIR)/usr/lib/libustr-debug* >> - $(RM) -rf $(TARGET_DIR)/usr/share/ustr-$(USTR_VERSION) >> -endef >> - >> -define HOST_USTR_BUILD_CMDS >> - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) all-shared >> -endef >> - >> -define HOST_USTR_INSTALL_CMDS >> - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) \ >> - install-shared >> -endef >> - >> -$(eval $(generic-package)) >> -$(eval $(host-generic-package)) >> +$(eval $(autotools-package)) >> +$(eval $(host-autotools-package)) > > Wow, so there's a Debian patch that converts it into an autotools package? > That's definitely worth mentioning explicitly in the commit log. I will update the commit log - however, do you think that we should proceed with utilizing these Debian patches? Thanks, -Ryan
Dear Ryan, All, Since I have already prepared a patch, I will send it to the list and let you guys decide the best approach to fix this problem. Regards, Sergio Prado Embedded Labworks Office: +55 11 2628-3461 Mobile: +55 11 97123-3420 2015-11-20 22:08 GMT-02:00 Ryan Barnett <ryanbarnett3@gmail.com>: > Hi Arnount, > > > On Fri, Nov 20, 2015 at 3:39 PM, Arnout Vandecappelle <arnout@mind.be> > wrote: > > On 20-11-15 02:39, Ryan Barnett wrote: > >> To fix issues with compiling with GCC 5.x, switch to utilzing the > >> debian patches for cross compiling. The debian tar was tired but the > >> series file in the folder is not compatiable with buildroot as it has > >> a 'p1' after each file. > > > > Peter merged 7caf46439 (apply-patches.sh: use everything from the > series file) > > so this should no longer be the case. Could you give it another go? > > When trying to use the Debian tar found here: > > http://http.debian.net/debian/pool/main/u/ustr/ustr_1.0.4-5.debian.tar.xz > > The following error occurs: > > Applying -p1 using series: > Error: missing patch file > > /opt/project/tmp/150fa803fc3b65f75dce2847907ee768fc94c7a7/output/build/ustr-1.0.4/.patches-ustr_1.0.4-5.debian.tar.xz-unpacked/debian/patches/-p1 > make[1]: *** > [/opt/project/tmp/150fa803fc3b65f75dce2847907ee768fc94c7a7/output/build/ustr-1.0.4/.stamp_patched] > Error 1 > > This is due to the fact that the series file is as follows > > fixes/autoconf.diff -p1 > fixes/doc-html-local-css.diff -p1 > fixes/gnu-inline.diff -p1 > fixes/man-cleanup.diff -p1 > fixes/man-spelling.diff -p1 > fixes/nonlinux.diff -p1 > fixes/stdarg-va_copy.diff -p1 > fixes/unused-vars.diff -p1 > > Any ideas on how to handle this? > > I'm using the latest master: > > 90d6fe5ae093438514ddee8bd68ca2b08a336eac > > >> diff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk > >> index 3144c0b..0daed3f 100644 > >> --- a/package/ustr/ustr.mk > >> +++ b/package/ustr/ustr.mk > >> @@ -9,46 +9,16 @@ USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2 > >> USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION) > >> USTR_LICENSE = BSD-2c MIT LGPLv2+ > >> USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT > >> +USTR_AUTORECONF = YES > >> +USTR_PATCH = \ > >> + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/autoconf.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > >> + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/doc-html-local-css.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > >> + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/gnu-inline.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > >> + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/nonlinux.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > >> + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/stdarg-va_copy.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > \ > >> + > https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/unused-vars.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 > >> > >> USTR_INSTALL_STAGING = YES > >> > >> -ifeq ($(BR2_STATIC_LIBS),y) > >> -USTR_BUILD_TARGETS = all > >> -USTR_INSTALL_TARGETS = install > >> -else ifeq ($(BR2_SHARED_LIBS),y) > >> -USTR_BUILD_TARGETS = all-shared > >> -USTR_INSTALL_TARGETS = install-shared > >> -else > >> -USTR_BUILD_TARGETS = all all-shared > >> -USTR_INSTALL_TARGETS = all install-shared > >> -endif > >> - > >> -define USTR_BUILD_CMDS > >> - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(USTR_BUILD_TARGETS) > >> -endef > >> - > >> -define USTR_INSTALL_STAGING_CMDS > >> - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ > >> - $(USTR_INSTALL_TARGETS) > >> - $(RM) -f $(STAGING_DIR)/usr/lib/libustr-debug* > >> - $(RM) -f $(STAGING_DIR)/usr/lib/pkgconfig/libustr-debug.pc > >> -endef > >> - > >> -define USTR_INSTALL_TARGET_CMDS > >> - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ > >> - $(USTR_INSTALL_TARGETS) > >> - $(RM) -f $(TARGET_DIR)/usr/lib/libustr-debug* > >> - $(RM) -rf $(TARGET_DIR)/usr/share/ustr-$(USTR_VERSION) > >> -endef > >> - > >> -define HOST_USTR_BUILD_CMDS > >> - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) all-shared > >> -endef > >> - > >> -define HOST_USTR_INSTALL_CMDS > >> - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) \ > >> - install-shared > >> -endef > >> - > >> -$(eval $(generic-package)) > >> -$(eval $(host-generic-package)) > >> +$(eval $(autotools-package)) > >> +$(eval $(host-autotools-package)) > > > > Wow, so there's a Debian patch that converts it into an autotools > package? > > That's definitely worth mentioning explicitly in the commit log. > > I will update the commit log - however, do you think that we should > proceed with utilizing these Debian patches? > > Thanks, > -Ryan > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot >
diff --git a/package/ustr/0001-cross-compile-modifications.patch b/package/ustr/0001-cross-compile-modifications.patch deleted file mode 100644 index ab75b44..0000000 --- a/package/ustr/0001-cross-compile-modifications.patch +++ /dev/null @@ -1,144 +0,0 @@ -Changes are to allow ustr version 1.0.4 to cross compile in buildroot. - -Signed-off-by Clayton Shotwell <clshotwe@rockwellcollins.com> - -diff -urN a/ustr-compiler.h b/ustr-compiler.h ---- a/ustr-compiler.h 2008-02-15 14:12:28.000000000 -0600 -+++ b/ustr-compiler.h 2012-06-15 11:04:55.000000000 -0500 -@@ -13,10 +13,10 @@ - - /* We assume this is enough, - * C99 specifies that va_copy() exists and is a macro */ --#ifdef va_copy -+#if defined va_copy - # define USTR_CONF_HAVE_VA_COPY 1 - # define USTR__VA_COPY(x, y) va_copy(x, y) --#elif __va_copy -+#elif defined __va_copy - # define USTR_CONF_HAVE_VA_COPY 1 - # define USTR__VA_COPY(x, y) __va_copy(x, y) - #else -diff -urN a/Makefile b/Makefile ---- a/Makefile 2008-03-05 21:38:00.000000000 -0600 -+++ b/Makefile 2013-09-10 16:54:45.916874387 -0500 -@@ -8,8 +8,8 @@ - VERS_ESONAME =1 - VERS_ESO =$(VERS_ESONAME).0.4 - --DESTDIR = --prefix=/usr -+DESTDIR ?= -+prefix ?= /usr - datadir=$(prefix)/share - libdir=$(prefix)/lib - libexecdir=$(prefix)/libexec -@@ -18,7 +18,7 @@ - SHRDIR=$(datadir)/ustr-$(VERS_FULL) - DOCSHRDIR=$(datadir)/doc/ustr-devel-$(VERS_FULL) - EXAMDIR=$(SHRDIR)/examples --mandir=$(datadir)/doc/man -+mandir=$(datadir)/man - MBINDIR=$(libexecdir)/ustr-$(VERS_FULL) - - ############################################################################### -@@ -28,12 +28,12 @@ - ############################################################################### - HIDE=@ - --CC = cc --AR = ar --RANLIB = ranlib --LDCONFIG = /sbin/ldconfig -+CC ?= cc -+AR ?= ar -+RANLIB ?= ranlib - --CFLAGS = -O2 -g -+CFLAGS ?= -O2 -g -+LDFLAGS ?= - - # Debug versions... - WARNS = -W -Wall -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wno-format-zero-length -Wformat-nonliteral -Wformat-security # -Wfloat-equal -- no floats -@@ -376,7 +376,7 @@ - all-shared: all $(LIB_SHARED) - $(HIDE)echo Done shared - --install: all-shared ustr.pc ustr-debug.pc -+install: all ustr.pc ustr-debug.pc - $(HIDE)echo Making directories - install -d $(DESTDIR)$(libdir) - install -d $(DESTDIR)$(includedir) -@@ -389,16 +389,6 @@ - install -d $(DESTDIR)$(libdir)/pkgconfig - $(HIDE)echo Installing files - install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC) -- install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED) -- -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) -- ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) -- -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) -- ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) -- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) -- ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) -- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) -- ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) -- $(LDCONFIG) -n $(DESTDIR)$(libdir) - install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS) - install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS) - install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS) -@@ -409,13 +399,24 @@ - install -m 755 -t $(DESTDIR)$(bindir) ustr-import - install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc - -+install-shared: all-shared install -+ $(HIDE)echo Installing files -+ install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED) -+ -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) -+ ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) -+ -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) -+ ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) -+ -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) -+ ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) -+ -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) -+ ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) -+ - ustr-import-multilib: ustr-import-multilib.in - sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@ - - install-multilib-linux: install autoconf_64b ustr-import-multilib - install -d $(DESTDIR)$(MBINDIR) -- $(HIDE)mlib=`./autoconf_64b`; \ -- if test "x$$mlib" = "x1"; then mlib=64; else mlib=32; fi; \ -+ $(HIDE))if test "`echo "__SIZEOF_SIZE_T__" | $(CC) -E -x c - | tail -n 1`" = 8; then mlib=64; else mlib=32; fi; \ - mv -f $(DESTDIR)$(includedir)/ustr-conf-debug.h \ - $(DESTDIR)$(includedir)/ustr-conf-debug-$$mlib.h; \ - mv -f $(DESTDIR)$(includedir)/ustr-conf.h \ -@@ -451,7 +452,8 @@ - - ustr-import: ustr-import.in autoconf_64b autoconf_vsnprintf - $(HIDE)echo Creating $@ -- $(HIDE)sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \ -+ $(HIDE)if test "`echo "__SIZEOF_SIZE_T__" | $(CC) -E -x c - | tail -n 1`" = 8; then sz64=1; else sz64=0; fi; \ -+ if test "`./autoconf_vsnprintf`" = 0; then vsnp=0; else vsnp=1; fi; \ - sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@SHRDIR@,$(SHRDIR),g' -e 's,@VERS@,$(VERS),g' -e 's,@VERS_FULL@,$(VERS_FULL),g' -e "s,@HAVE_64bit_SIZE_MAX@,$$sz64,g" -e "s,@HAVE_RETARDED_VSNPRINTF@,$$vsnp,g" < $< > $@ - $(HIDE)chmod 755 $@ - -@@ -485,7 +487,8 @@ - ustr-conf.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf - $(HIDE)echo Creating $@ - $(HIDE)have_stdint_h=0; dbg1=0; dbg2=0; \ -- sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \ -+ if test "`echo "__SIZEOF_SIZE_T__" | $(CC) -E -x c - | tail -n 1`" = 8; then sz64=1; else sz64=0; fi; \ -+ if test "`./autoconf_vsnprintf`" = 0; then vsnp=0; else vsnp=1; fi; \ - if test -f "/usr/include/stdint.h"; then have_stdint_h=1; fi; \ - if test -f "$(prefix)/include/stdint.h"; then have_stdint_h=1; fi; \ - if test -f "$(includedir)/stdint.h"; then have_stdint_h=1; fi; \ -@@ -494,7 +497,8 @@ - ustr-conf-debug.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf - $(HIDE)echo Creating $@ - $(HIDE)have_stdint_h=0; dbg1=1; dbg2=1; \ -- sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \ -+ if test "`echo "__SIZEOF_SIZE_T__" | $(CC) -E -x c - | tail -n 1`" = 8; then sz64=1; else sz64=0; fi; \ -+ if test "`./autoconf_vsnprintf`" = 0; then vsnp=0; else vsnp=1; fi; \ - if test -f "/usr/include/stdint.h"; then have_stdint_h=1; fi; \ - if test -f "$(prefix)/include/stdint.h"; then have_stdint_h=1; fi; \ - if test -f "$(includedir)/stdint.h"; then have_stdint_h=1; fi; \ diff --git a/package/ustr/ustr.hash b/package/ustr/ustr.hash index 2288bcf..810ad42 100644 --- a/package/ustr/ustr.hash +++ b/package/ustr/ustr.hash @@ -1,2 +1,8 @@ # Locally computed sha256 3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4 ustr-1.0.4.tar.bz2 +sha256 4412bddaa45be83e7dad06ab4caae16434b10f58b277ba21cf00d34c77b513ea autoconf.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 +sha256 1070db68359584e5d2cddeb54aa6f4ff8c46ca9a8539a0f55d5a40d7e2b17fc4 doc-html-local-css.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 +sha256 a643c6c64fa281ddd413075c5574884099cbd021116365769bd4f18b240f240d gnu-inline.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 +sha256 2a7801d15d009da23a6b83635caf465535620d3a70dac8095dba1051f2745860 nonlinux.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 +sha256 364a4656dce7d3c41950077ef8287b7a13355665609b1853682ea2922fdd5c63 stdarg-va_copy.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 +sha256 4d485150bc5f3bf87243b9d20be1b2f89d94263e1bf5fa15025009be67f5fd1f unused-vars.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 diff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk index 3144c0b..0daed3f 100644 --- a/package/ustr/ustr.mk +++ b/package/ustr/ustr.mk @@ -9,46 +9,16 @@ USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2 USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION) USTR_LICENSE = BSD-2c MIT LGPLv2+ USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT +USTR_AUTORECONF = YES +USTR_PATCH = \ + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/autoconf.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/doc-html-local-css.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/gnu-inline.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/nonlinux.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/stdarg-va_copy.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 \ + https://anonscm.debian.org/cgit/users/zito-guest/pkg-ustr.git/plain/debian/patches/fixes/unused-vars.diff?id=b09545eda93cc75d0510bc100a236b432e3c81b8 USTR_INSTALL_STAGING = YES -ifeq ($(BR2_STATIC_LIBS),y) -USTR_BUILD_TARGETS = all -USTR_INSTALL_TARGETS = install -else ifeq ($(BR2_SHARED_LIBS),y) -USTR_BUILD_TARGETS = all-shared -USTR_INSTALL_TARGETS = install-shared -else -USTR_BUILD_TARGETS = all all-shared -USTR_INSTALL_TARGETS = all install-shared -endif - -define USTR_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(USTR_BUILD_TARGETS) -endef - -define USTR_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ - $(USTR_INSTALL_TARGETS) - $(RM) -f $(STAGING_DIR)/usr/lib/libustr-debug* - $(RM) -f $(STAGING_DIR)/usr/lib/pkgconfig/libustr-debug.pc -endef - -define USTR_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ - $(USTR_INSTALL_TARGETS) - $(RM) -f $(TARGET_DIR)/usr/lib/libustr-debug* - $(RM) -rf $(TARGET_DIR)/usr/share/ustr-$(USTR_VERSION) -endef - -define HOST_USTR_BUILD_CMDS - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) all-shared -endef - -define HOST_USTR_INSTALL_CMDS - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) \ - install-shared -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
To fix issues with compiling with GCC 5.x, switch to utilzing the debian patches for cross compiling. The debian tar was tired but the series file in the folder is not compatiable with buildroot as it has a 'p1' after each file. This means the patches are individually listed. Fixes: http://autobuild.buildroot.net/results/150/150fa803fc3b65f75dce2847907ee768fc94c7a7 http://autobuild.buildroot.net/results/150/150fa803fc3b65f75dce2847907ee768fc94c7a7 ...and many more Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com> --- .../ustr/0001-cross-compile-modifications.patch | 144 --------------------- package/ustr/ustr.hash | 6 + package/ustr/ustr.mk | 50 ++----- 3 files changed, 16 insertions(+), 184 deletions(-) delete mode 100644 package/ustr/0001-cross-compile-modifications.patch