Patchwork [1/1] omniorb: fix autobuilder failure

login
register
mail settings
Submitter Matt Weber
Date Oct. 21, 2013, 1:39 p.m.
Message ID <1382362757-24499-1-git-send-email-mlweber1@rockwellcollins.com>
Download mbox | patch
Permalink /patch/285194/
State Accepted
Commit f870e9104d3570fbc2d7656f274cf225db56ccbb
Headers show

Comments

Matt Weber - Oct. 21, 2013, 1:39 p.m.
http://autobuild.buildroot.net/results/e3244abc550a95eb69e63b8db203f39b27f3288e/

Turns out omniorb isn't building because of an old cross compile patch.
The last patchset was missing the delete.

Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
---
 .../omniorb-0001-crosscompile-tool-export.patch    |   30 --------------------
 1 files changed, 0 insertions(+), 30 deletions(-)
 delete mode 100644 package/omniorb/omniorb-0001-crosscompile-tool-export.patch
Peter Korsgaard - Nov. 4, 2013, 10:49 p.m.
>>>>> "Matt" == Matt Weber <mlweber1@rockwellcollins.com> writes:

 > http://autobuild.buildroot.net/results/e3244abc550a95eb69e63b8db203f39b27f3288e/
 > Turns out omniorb isn't building because of an old cross compile patch.
 > The last patchset was missing the delete.

 > Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>

Committed, thanks.

Patch

diff --git a/package/omniorb/omniorb-0001-crosscompile-tool-export.patch b/package/omniorb/omniorb-0001-crosscompile-tool-export.patch
deleted file mode 100644
index 260d86f..0000000
--- a/package/omniorb/omniorb-0001-crosscompile-tool-export.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-beforeauto.mk.in: added support for overriding the configure time
-defined CC/CXX/RANLIB/CPP variables so that a couple pkg tools could be
-built which generate code during the cross compile build.
-
-http://www.omniorb-support.com/pipermail/omniorb-list/2013-September/031473.html
-
-Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
-
---- omniorb-4.1.6.orig/mk/beforeauto.mk.in	2013-09-12 12:49:55.668708148 -0500
-+++ omniorb-4.1.6/mk/beforeauto.mk.in	2013-09-12 12:51:22.707928579 -0500
-@@ -672,15 +672,15 @@
- #
- 
- AR              = ar cq
--CC              = @CC@
--CXX             = @CXX@
--RANLIB		= @RANLIB@
-+CC		?= @CC@
-+CXX		?= @CXX@
-+RANLIB		?= @RANLIB@
- MKDIRHIER	= $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
- INSTLIBFLAGS	= -m 0644
- INSTEXEFLAGS	= -m 0755
- CP		= cp
- MV		= mv -f
--CPP		= @CPP@
-+CPP		?= @CPP@
- OMKDEPEND	= $(TOOLBINDIR)/omkdepend
- RMDIRHIER	= $(RM) -rf
-