diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-30 16:02:47 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-30 16:02:47 +0000 |
| commit | 77d32fcd1d45b9fd073964382fd2f6753d272ccc (patch) | |
| tree | ec28fdf93b15d6d6db4ac10b5641c059e526fa78 /packages | |
| parent | 64c2f3ecd35d4eb2aacde6705cdbb4fffb2fc5aa (diff) | |
| parent | 5a2b19f3c9fbb5621696b4f20a04e39f251e7df9 (diff) | |
merge of 'cc5e07dd7b07fafb652332925795d57a51e7d58c'
and 'f90c9d0f1288b060a8c57b9eb3c70e06353fe93a'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gammu/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gammu/files/ldflags-again.patch | 13 | ||||
| -rw-r--r-- | packages/gammu/gammu_1.10.0.bb (renamed from packages/gammu/gammu_1.07.00.bb) | 16 |
3 files changed, 22 insertions, 7 deletions
diff --git a/packages/gammu/files/.mtn2git_empty b/packages/gammu/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gammu/files/.mtn2git_empty diff --git a/packages/gammu/files/ldflags-again.patch b/packages/gammu/files/ldflags-again.patch new file mode 100644 index 0000000000..90311e5f39 --- /dev/null +++ b/packages/gammu/files/ldflags-again.patch @@ -0,0 +1,13 @@ +Index: gammu-1.10.0/cfg/Makefile.glo +=================================================================== +--- gammu-1.10.0.orig/cfg/Makefile.glo 2007-03-30 17:55:18.000000000 +0200 ++++ gammu-1.10.0/cfg/Makefile.glo 2007-03-30 17:55:46.000000000 +0200 +@@ -152,7 +152,7 @@ + + $(TOPDIR)/gammu/gammu-shared: $(COMMON) $(GAMMU) $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) + @echo Linking gammu-shared +- @$(CC) -L$(TOPDIR)/common -lGammu $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared ++ @$(CC) -L$(TOPDIR)/common -lGammu $(LDLIBS) $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared + + shared: $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(TOPDIR)/common/$(LIBGAMMU_STATIC) $(TOPDIR)/gammu/gammu-shared + diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.10.0.bb index 49a2f21399..9e3f611697 100644 --- a/packages/gammu/gammu_1.07.00.bb +++ b/packages/gammu/gammu_1.10.0.bb @@ -2,24 +2,26 @@ DESCRIPTION = "GNU All Mobile Managment Utilities" SECTION = "console/network" DEPENDS = "bluez-libs" LICENSE = "GPL" -HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html" -AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>" +HOMEPAGE = "http://www.gammu.org/" -SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz " +SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \ + file://ldflags-again.patch;patch=1" -EXTRA_OECONF = "--disable-mysql" +EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}" + +EXTRA_LDFLAGS = "-lbluetooth2" inherit autotools do_compile () { - oe_runmake shared + oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth' } do_stage() { install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ - ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \ + ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \ ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ @@ -39,7 +41,7 @@ do_stage() { install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 - install -m 0644 common/phone/nokia/dct4tiku/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku + install -m 0644 common/phone/nokia/dct4s40/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service |