Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/303719/?format=api
{ "id": 303719, "url": "http://patchwork.ozlabs.org/api/patches/303719/?format=api", "web_url": "http://patchwork.ozlabs.org/project/buildroot/patch/1387485489-4186-4-git-send-email-clshotwe@rockwellcollins.com/", "project": { "id": 27, "url": "http://patchwork.ozlabs.org/api/projects/27/?format=api", "name": "Buildroot development", "link_name": "buildroot", "list_id": "buildroot.buildroot.org", "list_email": "buildroot@buildroot.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1387485489-4186-4-git-send-email-clshotwe@rockwellcollins.com>", "list_archive_url": null, "date": "2013-12-19T20:37:52", "name": "[v5,03/20] ustr: new package", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "3f951d75cca4d2713ae1224324c60792291348d2", "submitter": { "id": 38285, "url": "http://patchwork.ozlabs.org/api/people/38285/?format=api", "name": "Clayton Shotwell", "email": "clshotwe@rockwellcollins.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/buildroot/patch/1387485489-4186-4-git-send-email-clshotwe@rockwellcollins.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/303719/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/303719/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<buildroot-bounces@busybox.net>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "buildroot@lists.busybox.net" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "buildroot@osuosl.org" ], "Received": [ "from whitealder.osuosl.org (whitealder.osuosl.org\n\t[140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 9C5742C0079\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 20 Dec 2013 07:39:11 +1100 (EST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id F382B8C5FF;\n\tThu, 19 Dec 2013 20:39:10 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id FbF9IFzZ9M4I; Thu, 19 Dec 2013 20:39:03 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 8D8808C667;\n\tThu, 19 Dec 2013 20:38:45 +0000 (UTC)", "from whitealder.osuosl.org (whitealder.osuosl.org\n\t[140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 00D271BF99B\n\tfor <buildroot@lists.busybox.net>;\n\tThu, 19 Dec 2013 20:38:39 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 02CA48C5C9\n\tfor <buildroot@lists.busybox.net>;\n\tThu, 19 Dec 2013 20:38:39 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id kzpDuEwIVLcl for <buildroot@lists.busybox.net>;\n\tThu, 19 Dec 2013 20:38:38 +0000 (UTC)", "from secvs01.rockwellcollins.com (secvs01.rockwellcollins.com\n\t[205.175.225.240])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id B77048C318\n\tfor <buildroot@busybox.net>; Thu, 19 Dec 2013 20:38:37 +0000 (UTC)", "from nosuchhost.198.131.in-addr.arpa (HELO\n\tcollinscrsmtp01.rockwellcollins.com) ([131.198.63.132])\n\tby mail-virt.rockwellcollins.com with ESMTP;\n\t19 Dec 2013 14:38:18 -0600", "from nyx ([131.198.63.11])\n\tby collinscrsmtp01.rockwellcollins.com (Lotus Domino Release 8.5.2FP2\n\tHF162) with ESMTP id 2013121914381596-2990134 ;\n\tThu, 19 Dec 2013 14:38:15 -0600 " ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "From": "Clayton Shotwell <clshotwe@rockwellcollins.com>", "To": "buildroot@busybox.net", "Date": "Thu, 19 Dec 2013 14:37:52 -0600", "Message-Id": "<1387485489-4186-4-git-send-email-clshotwe@rockwellcollins.com>", "X-Mailer": "git-send-email 1.7.1", "In-Reply-To": "<1387485489-4186-1-git-send-email-clshotwe@rockwellcollins.com>", "References": "<1387485489-4186-1-git-send-email-clshotwe@rockwellcollins.com>", "X-MIMETrack": "Itemize by SMTP Server on\n\tCollinsCRSMTP01/CedarRapids/Collins/Rockwell(Release\n\t8.5.2FP2 HF162|May 16, 2011) at 12/19/2013 02:38:15 PM,\n\tSerialize by Router on\n\tCollinsCRSMTP01/CedarRapids/Collins/Rockwell(Release\n\t8.5.2FP2 HF162|May 16, 2011) at 12/19/2013 02:38:17 PM,\n\tSerialize complete at 12/19/2013 02:38:17 PM", "X-TNEFEvaluated": "1", "Cc": "Clayton Shotwell <clshotwe@rockwellcollins.com>", "Subject": "[Buildroot] [PATCH v5 03/20] ustr: new package", "X-BeenThere": "buildroot@busybox.net", "X-Mailman-Version": "2.1.14", "Precedence": "list", "List-Id": "Discussion and development of buildroot <buildroot.busybox.net>", "List-Unsubscribe": "<http://lists.busybox.net/mailman/options/buildroot>,\n\t<mailto:buildroot-request@busybox.net?subject=unsubscribe>", "List-Archive": "<http://lists.busybox.net/pipermail/buildroot>", "List-Post": "<mailto:buildroot@busybox.net>", "List-Help": "<mailto:buildroot-request@busybox.net?subject=help>", "List-Subscribe": "<http://lists.busybox.net/mailman/listinfo/buildroot>,\n\t<mailto:buildroot-request@busybox.net?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "buildroot-bounces@busybox.net", "Sender": "buildroot-bounces@busybox.net" }, "content": "Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>\n---\nChanges v4 -> v5:\n - Added a step to remove installed source code from the target\n file system.\nChanges v3 -> v4:\n - Removed the clean command.\nChanges v2 -> v3:\n - Changes patch naming convention (suggested by Thomas).\n - Added a dependency on BR2_LARGEFILE (suggested by Thomas).\nChanges v1 -> v2:\n - General cleanup to the mk file to conform to the standard format.\n - Fixed the patch naming to avoid using the version number.\n - Cleaned up the patch to include a signed-off-by line.\n - Added a check to only build static libraries if selected.\n---\n package/Config.in | 1 +\n package/ustr/Config.in | 11 ++\n .../ustr-0001-cross-compile-modifications.patch | 144 ++++++++++++++++++++\n package/ustr/ustr.mk | 48 +++++++\n 4 files changed, 204 insertions(+), 0 deletions(-)\n create mode 100644 package/ustr/Config.in\n create mode 100644 package/ustr/ustr-0001-cross-compile-modifications.patch\n create mode 100644 package/ustr/ustr.mk", "diff": "diff --git a/package/Config.in b/package/Config.in\nindex c57b169..b71b82a 100644\n--- a/package/Config.in\n+++ b/package/Config.in\n@@ -756,6 +756,7 @@ source \"package/pcre/Config.in\"\n source \"package/popt/Config.in\"\n source \"package/readline/Config.in\"\n source \"package/slang/Config.in\"\n+source \"package/ustr/Config.in\"\n endmenu\n \n endmenu\ndiff --git a/package/ustr/Config.in b/package/ustr/Config.in\nnew file mode 100644\nindex 0000000..0aa2251\n--- /dev/null\n+++ b/package/ustr/Config.in\n@@ -0,0 +1,11 @@\n+config BR2_PACKAGE_USTR\n+\tbool \"ustr\"\n+\tdepends on BR2_LARGEFILE\n+\thelp\n+\t A small, safe string library.\n+\t \n+\t http://www.and.org/ustr/\n+\n+comment \"ustr requires a toolchain with large file support\"\n+\tdepends on !BR2_LARGEFILE\n+\ndiff --git a/package/ustr/ustr-0001-cross-compile-modifications.patch b/package/ustr/ustr-0001-cross-compile-modifications.patch\nnew file mode 100644\nindex 0000000..cdf17c5\n--- /dev/null\n+++ b/package/ustr/ustr-0001-cross-compile-modifications.patch\n@@ -0,0 +1,144 @@\n+Changes are to allow ustr verion 1.0.4 to cross compile in buildroot.\n+\n+Signed-off-by Clayton Shotwell <clshotwe@rockwellcollins.com>\n+\n+diff -urN a/ustr-compiler.h b/ustr-compiler.h\n+--- a/ustr-compiler.h\t2008-02-15 14:12:28.000000000 -0600\n++++ b/ustr-compiler.h\t2012-06-15 11:04:55.000000000 -0500\n+@@ -13,10 +13,10 @@\n+ \n+ /* We assume this is enough,\n+ * C99 specifies that va_copy() exists and is a macro */\n+-#ifdef va_copy\n++#if defined va_copy\n+ # define USTR_CONF_HAVE_VA_COPY 1\n+ # define USTR__VA_COPY(x, y) va_copy(x, y)\n+-#elif __va_copy\n++#elif defined __va_copy\n+ # define USTR_CONF_HAVE_VA_COPY 1\n+ # define USTR__VA_COPY(x, y) __va_copy(x, y)\n+ #else\n+diff -urN a/Makefile b/Makefile\n+--- a/Makefile\t2008-03-05 21:38:00.000000000 -0600\n++++ b/Makefile\t2013-09-10 16:54:45.916874387 -0500\n+@@ -8,8 +8,8 @@\n+ VERS_ESONAME =1\n+ VERS_ESO =$(VERS_ESONAME).0.4\n+ \n+-DESTDIR =\n+-prefix=/usr\n++DESTDIR ?= \n++prefix ?= /usr\n+ datadir=$(prefix)/share\n+ libdir=$(prefix)/lib\n+ libexecdir=$(prefix)/libexec\n+@@ -18,7 +18,7 @@\n+ SHRDIR=$(datadir)/ustr-$(VERS_FULL)\n+ DOCSHRDIR=$(datadir)/doc/ustr-devel-$(VERS_FULL)\n+ EXAMDIR=$(SHRDIR)/examples\n+-mandir=$(datadir)/doc/man\n++mandir=$(datadir)/man\n+ MBINDIR=$(libexecdir)/ustr-$(VERS_FULL)\n+ \n+ ###############################################################################\n+@@ -28,12 +28,12 @@\n+ ###############################################################################\n+ HIDE=@\n+ \n+-CC = cc\n+-AR = ar\n+-RANLIB = ranlib\n+-LDCONFIG = /sbin/ldconfig\n++CC ?= cc\n++AR ?= ar\n++RANLIB ?= ranlib\n+ \n+-CFLAGS = -O2 -g\n++CFLAGS ?= -O2 -g\n++LDFLAGS ?= \n+ \n+ # Debug versions...\n+ 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\n+@@ -376,7 +376,7 @@\n+ all-shared: all $(LIB_SHARED)\n+ \t\t$(HIDE)echo Done shared\n+ \n+-install: all-shared ustr.pc ustr-debug.pc\n++install: all ustr.pc ustr-debug.pc\n+ \t\t$(HIDE)echo Making directories\n+ \t\tinstall -d $(DESTDIR)$(libdir)\n+ \t\tinstall -d $(DESTDIR)$(includedir)\n+@@ -389,16 +389,6 @@\n+ \t\tinstall -d $(DESTDIR)$(libdir)/pkgconfig\n+ \t\t$(HIDE)echo Installing files\n+ \t\tinstall -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC)\n+-\t\tinstall -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED)\n+-\t\t-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)\n+-\t\tln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)\n+-\t\t-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)\n+-\t\tln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)\n+-\t\t-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)\n+-\t\tln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)\n+-\t\t-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)\n+-\t\tln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)\n+-\t\t$(LDCONFIG) -n $(DESTDIR)$(libdir)\n+ \t\tinstall -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS)\n+ \t\tinstall -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS)\n+ \t\tinstall -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS)\n+@@ -409,13 +399,24 @@\n+ \t\tinstall -m 755 -t $(DESTDIR)$(bindir) ustr-import\n+ \t\tinstall -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc\n+ \n++install-shared: all-shared install\n++\t\t$(HIDE)echo Installing files\n++\t\tinstall -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED)\n++\t\t-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)\n++\t\tln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)\n++\t\t-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)\n++\t\tln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)\n++\t\t-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)\n++\t\tln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)\n++\t\t-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)\n++\t\tln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)\n++\n+ ustr-import-multilib: ustr-import-multilib.in\n+ \t\tsed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@\n+ \n+ install-multilib-linux: install autoconf_64b ustr-import-multilib\n+ \t\tinstall -d $(DESTDIR)$(MBINDIR)\n+-\t\t$(HIDE)mlib=`./autoconf_64b`; \\\n+- if test \"x$$mlib\" = \"x1\"; then mlib=64; else mlib=32; fi; \\\n++\t\t$(HIDE))if test \"`echo \"__SIZEOF_SIZE_T__\" | $(CC) -E -x c - | tail -n 1`\" = 8; then mlib=64; else mlib=32; fi; \\\n+ mv -f $(DESTDIR)$(includedir)/ustr-conf-debug.h \\\n+ $(DESTDIR)$(includedir)/ustr-conf-debug-$$mlib.h; \\\n+ mv -f $(DESTDIR)$(includedir)/ustr-conf.h \\\n+@@ -451,7 +452,8 @@\n+ \n+ ustr-import: ustr-import.in autoconf_64b autoconf_vsnprintf\n+ \t\t$(HIDE)echo Creating $@\n+-\t\t$(HIDE)sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \\\n++\t\t$(HIDE)if test \"`echo \"__SIZEOF_SIZE_T__\" | $(CC) -E -x c - | tail -n 1`\" = 8; then sz64=1; else sz64=0; fi; \\\n++\t\tif test \"`./autoconf_vsnprintf`\" = 0; then vsnp=0; else vsnp=1; fi; \\\n+ \t\tsed -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\" < $< > $@\n+ \t\t$(HIDE)chmod 755 $@\n+ \n+@@ -485,7 +487,8 @@\n+ ustr-conf.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf\n+ \t\t$(HIDE)echo Creating $@\n+ \t\t$(HIDE)have_stdint_h=0; dbg1=0; dbg2=0; \\\n+- sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \\\n++ if test \"`echo \"__SIZEOF_SIZE_T__\" | $(CC) -E -x c - | tail -n 1`\" = 8; then sz64=1; else sz64=0; fi; \\\n++ if test \"`./autoconf_vsnprintf`\" = 0; then vsnp=0; else vsnp=1; fi; \\\n+ if test -f \"/usr/include/stdint.h\"; then have_stdint_h=1; fi; \\\n+ if test -f \"$(prefix)/include/stdint.h\"; then have_stdint_h=1; fi; \\\n+ if test -f \"$(includedir)/stdint.h\"; then have_stdint_h=1; fi; \\\n+@@ -494,7 +497,8 @@\n+ ustr-conf-debug.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf\n+ \t\t$(HIDE)echo Creating $@\n+ \t\t$(HIDE)have_stdint_h=0; dbg1=1; dbg2=1; \\\n+- sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \\\n++ if test \"`echo \"__SIZEOF_SIZE_T__\" | $(CC) -E -x c - | tail -n 1`\" = 8; then sz64=1; else sz64=0; fi; \\\n++ if test \"`./autoconf_vsnprintf`\" = 0; then vsnp=0; else vsnp=1; fi; \\\n+ if test -f \"/usr/include/stdint.h\"; then have_stdint_h=1; fi; \\\n+ if test -f \"$(prefix)/include/stdint.h\"; then have_stdint_h=1; fi; \\\n+ if test -f \"$(includedir)/stdint.h\"; then have_stdint_h=1; fi; \\\ndiff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk\nnew file mode 100644\nindex 0000000..6610b49\n--- /dev/null\n+++ b/package/ustr/ustr.mk\n@@ -0,0 +1,48 @@\n+################################################################################\n+#\n+# ustr\n+#\n+################################################################################\n+\n+USTR_VERSION = 1.0.4\n+USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2\n+USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION)/\n+USTR_LICENSE = BSD-2c MIT LGPLv2+\n+USTR_LICENSE_FILES = LICENCE LICENSE_BSD LICENSE_LGPL LICENSE_MIT\n+\n+USTR_INSTALL_STAGING = YES\n+\n+ifeq ($(BR2_PREFER_STATIC_LIB),y)\n+\tUSTR_BUILD_CMD = all\n+\tUSTR_INSTALL_CMD = install\n+else\n+\tUSTR_BUILD_CMD = all all-shared\n+\tUSTR_INSTALL_CMD = install install-shared\n+endif\n+\n+define USTR_BUILD_CMDS\n+\t$(MAKE) -C $(@D) $(USTR_BUILD_CMD) $(TARGET_CONFIGURE_OPTS)\n+endef\n+\n+define USTR_INSTALL_STAGING_CMDS\n+\t$(MAKE) -C $(@D) $(USTR_INSTALL_CMD) $(TARGET_CONFIGURE_OPTS) \\\n+\t\tDESTDIR=$(STAGING_DIR)\n+endef\n+\n+define USTR_INSTALL_TARGET_CMDS\n+\t$(MAKE) -C $(@D) $(USTR_INSTALL_CMD) $(TARGET_CONFIGURE_OPTS) \\\n+\t\tDESTDIR=$(TARGET_DIR)\n+\t$(RM) -r $(TARGET_DIR)/usr/share/ustr-$(USTR_VERSION)\n+endef\n+\n+define HOST_USTR_BUILD_CMDS\n+\t$(MAKE) -C $(@D) $(USTR_BUILD_CMD) $(HOST_CONFIGURE_OPTS)\n+endef\n+\n+define HOST_USTR_INSTALL_CMDS\n+\t$(MAKE) -C $(@D) $(USTR_INSTALL_CMD) $(HOST_CONFIGURE_OPTS) \\\n+\t\tDESTDIR=$(HOST_DIR)\n+endef\n+\n+$(eval $(generic-package))\n+$(eval $(host-generic-package))\n", "prefixes": [ "v5", "03/20" ] }