diff options
| -rw-r--r-- | meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch new file mode 100644 index 0000000000..f4f0ef870e --- /dev/null +++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | Obey LDFLAGS | ||
| 2 | |||
| 3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
| 4 | Upstream-status: Pending | ||
| 5 | |||
| 6 | --- uuid-1.6.2.orig/Makefile.in | ||
| 7 | +++ uuid-1.6.2/Makefile.in | ||
| 8 | @@ -113,15 +113,15 @@ all: $(TARGETS) | ||
| 9 | @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< | ||
| 10 | |||
| 11 | $(LIB_NAME): $(LIB_OBJS) | ||
| 12 | - @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ | ||
| 13 | + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ | ||
| 14 | -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` | ||
| 15 | |||
| 16 | $(DCE_NAME): $(DCE_OBJS) | ||
| 17 | - @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ | ||
| 18 | + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ | ||
| 19 | -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` | ||
| 20 | |||
| 21 | $(CXX_NAME): $(CXX_OBJS) | ||
| 22 | - @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ | ||
| 23 | + @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ | ||
| 24 | -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` | ||
| 25 | |||
| 26 | $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME) | ||
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb index f524854a2d..160990c142 100644 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb +++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | |||
| @@ -25,6 +25,7 @@ SRC_URI = "http://gnome-build-stage-1.googlecode.com/files/uuid-1.6.2.tar.gz \ | |||
| 25 | file://uuid-libtool.patch \ | 25 | file://uuid-libtool.patch \ |
| 26 | file://uuid-nostrip.patch \ | 26 | file://uuid-nostrip.patch \ |
| 27 | file://install-pc.patch \ | 27 | file://install-pc.patch \ |
| 28 | file://ldflags.patch \ | ||
| 28 | " | 29 | " |
| 29 | SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f" | 30 | SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f" |
| 30 | SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" | 31 | SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" |
