| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | This patch fixes libtool QA issues with WORKDIR creeping in to |
| 2 | libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded. |
| 3 | |
| 4 | Upstream-Status: Inappropriate [Other] |
| 5 | Workaround is specific to our build system. |
| 6 | |
| 7 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
| 8 | |
| 9 | Index: openjade-1.3.2/spgrove/Makefile.sub |
| 10 | =================================================================== |
| 11 | --- openjade-1.3.2.orig/spgrove/Makefile.sub |
| 12 | +++ openjade-1.3.2/spgrove/Makefile.sub |
| 13 | @@ -1,8 +1,8 @@ |
| 14 | LTVERSION=0:1:0 |
| 15 | LIB=ospgrove |
| 16 | INCLUDE=-I$(srcdir)/../grove |
| 17 | -DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ |
| 18 | - -L$(TOP)/lib -L$(TOP)/lib/.libs \ |
| 19 | +DEPLIBS=-lm $(TOP)/grove \ |
| 20 | + $(TOP)/lib \ |
| 21 | $(LIB_THREADS) |
| 22 | OBJS=GroveApp.o GroveBuilder.o SdNode.o |
| 23 | GENSRCS=grove_inst.cxx |
| 24 | Index: openjade-1.3.2/style/Makefile.sub |
| 25 | =================================================================== |
| 26 | --- openjade-1.3.2.orig/style/Makefile.sub |
| 27 | +++ openjade-1.3.2/style/Makefile.sub |
| 28 | @@ -1,8 +1,8 @@ |
| 29 | LTVERSION=0:1:0 |
| 30 | LIB=ostyle |
| 31 | -DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ |
| 32 | - -L$(TOP)/lib -L$(TOP)/lib/.libs \ |
| 33 | - -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs |
| 34 | +DEPLIBS=-lm $(TOP)/grove \ |
| 35 | + $(TOP)/lib \ |
| 36 | + $(TOP)/spgrove |
| 37 | OBJS=LangObj.o \ |
| 38 | Collector.o \ |
| 39 | DssslApp.o \ |