diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-27 17:53:03 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-27 17:53:03 +0100 |
commit | 4909fcd51cd106aca4c570eb7aee3d7f2a2f597c (patch) | |
tree | 5eea425f4e208bc0c0287d7082705ad082e64961 /meta-moblin | |
parent | 31a29d20328c009c7812585f8f1c353cab0b3289 (diff) | |
download | poky-4909fcd51cd106aca4c570eb7aee3d7f2a2f597c.tar.gz |
libsynthesis: Drop patch since upstream has made similar changes now
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin')
-rw-r--r-- | meta-moblin/packages/libsynthesis/libsynthesis/addpkgconfig.patch | 38 | ||||
-rw-r--r-- | meta-moblin/packages/libsynthesis/libsynthesis_git.bb | 5 |
2 files changed, 2 insertions, 41 deletions
diff --git a/meta-moblin/packages/libsynthesis/libsynthesis/addpkgconfig.patch b/meta-moblin/packages/libsynthesis/libsynthesis/addpkgconfig.patch deleted file mode 100644 index 1f5bbbb0e4..0000000000 --- a/meta-moblin/packages/libsynthesis/libsynthesis/addpkgconfig.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Index: git/configure.in | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.in 2009-07-16 11:10:03.000000000 +0100 | ||
4 | +++ git/configure.in 2009-07-16 11:10:46.000000000 +0100 | ||
5 | @@ -106,5 +106,5 @@ | ||
6 | fi | ||
7 | AM_CONDITIONAL([COND_STATIC], [test "$enable_shared" = "no"]) | ||
8 | |||
9 | -AC_CONFIG_FILES(Makefile src/Makefile) | ||
10 | +AC_CONFIG_FILES(Makefile src/Makefile synthesis.pc) | ||
11 | AC_OUTPUT | ||
12 | Index: git/synthesis.pc.in | ||
13 | =================================================================== | ||
14 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
15 | +++ git/synthesis.pc.in 2009-07-16 11:11:48.000000000 +0100 | ||
16 | @@ -0,0 +1,10 @@ | ||
17 | +prefix=@prefix@ | ||
18 | +exec_prefix=@exec_prefix@ | ||
19 | +libdir=@libdir@ | ||
20 | +includedir=@includedir@ | ||
21 | + | ||
22 | +Name: synthesis | ||
23 | +Description: Synthesis SyncML Client Library | ||
24 | +Version: @VERSION@ | ||
25 | +Libs: -L${libdir} -lsynthesis -lsynthesissdk | ||
26 | +Cflags: | ||
27 | Index: git/Makefile.am | ||
28 | =================================================================== | ||
29 | --- git.orig/Makefile.am 2009-07-16 11:13:34.000000000 +0100 | ||
30 | +++ git/Makefile.am 2009-07-16 11:14:02.000000000 +0100 | ||
31 | @@ -9,3 +9,6 @@ | ||
32 | MAINTAINERCLEANFILES = Makefile.in config.guess config.sub configure depcomp install-sh ltmain.sh missing mkinstalldirs | ||
33 | |||
34 | ACLOCAL_AMFLAGS = -I m4 | ||
35 | + | ||
36 | +pkgconfigdir = $(libdir)/pkgconfig | ||
37 | +pkgconfig_DATA = synthesis.pc | ||
38 | \ No newline at end of file | ||
diff --git a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb index e4fffc0cc7..6a14af110e 100644 --- a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb +++ b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | DESCRIPTION = "Synthesis SyncML Engine" | 1 | DESCRIPTION = "Synthesis SyncML Engine" |
2 | SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ | 2 | SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" |
3 | file://addpkgconfig.patch;patch=1" | ||
4 | LICENSE = "LGPLv2.1" | 3 | LICENSE = "LGPLv2.1" |
5 | PV = "0.0+git${SRCPV}" | 4 | PV = "0.0+git${SRCPV}" |
6 | PR = "r0" | 5 | PR = "r1" |
7 | 6 | ||
8 | DEPENDS = "libpcre" | 7 | DEPENDS = "libpcre" |
9 | 8 | ||