mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-08 03:49:57 +00:00
liblockfile, libungif: import from oe-classic
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -0,0 +1,25 @@
|
|||||||
|
|
||||||
|
#
|
||||||
|
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||||
|
#
|
||||||
|
|
||||||
|
--- liblockfile-1.05/./configure.in~configure
|
||||||
|
+++ liblockfile-1.05/./configure.in
|
||||||
|
@@ -1,4 +1,5 @@
|
||||||
|
-AC_INIT(lockfile.c)
|
||||||
|
+AC_INIT
|
||||||
|
+AC_CONFIG_SRCDIR([lockfile.c])
|
||||||
|
AC_CONFIG_HEADER(autoconf.h)
|
||||||
|
AC_REVISION($Revision: 1.0 $)dnl
|
||||||
|
|
||||||
|
@@ -111,7 +112,8 @@
|
||||||
|
AC_SUBST(INSTALL_TARGETS)
|
||||||
|
AC_SUBST(nfslockdir)
|
||||||
|
|
||||||
|
-AC_OUTPUT(\
|
||||||
|
+AC_CONFIG_FILES([\
|
||||||
|
./Makefile \
|
||||||
|
./maillock.h \
|
||||||
|
-)
|
||||||
|
+])
|
||||||
|
+AC_OUTPUT
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
The local function eaccess conflicts with a glibc function of the same name.
|
||||||
|
Rename the function so that this can be build under glibc 2.4, and older
|
||||||
|
revisions, without any problems.
|
||||||
|
|
||||||
|
--- liblockfile-1.06/dotlockfile.c 2006/07/10 03:17:40 1.1
|
||||||
|
+++ liblockfile-1.06/dotlockfile.c 2006/07/10 03:18:26
|
||||||
|
@@ -42,7 +42,7 @@
|
||||||
|
extern int optind;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-extern int eaccess(char *, gid_t, struct stat *);
|
||||||
|
+extern int xeaccess(char *, gid_t, struct stat *);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Sleep for an amout of time while regulary checking if
|
||||||
|
@@ -252,14 +252,14 @@
|
||||||
|
return L_ERROR;
|
||||||
|
}
|
||||||
|
gid = getgid();
|
||||||
|
- if (eaccess(dir, gid, &st) < 0) {
|
||||||
|
+ if (xeaccess(dir, gid, &st) < 0) {
|
||||||
|
if (errno == ENOENT) {
|
||||||
|
enoent:
|
||||||
|
if (!quiet) fprintf(stderr,
|
||||||
|
"dotlockfile: %s: no such directory\n", dir);
|
||||||
|
return L_TMPLOCK;
|
||||||
|
}
|
||||||
|
- if ((r = eaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
|
||||||
|
+ if ((r = xeaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
|
||||||
|
goto enoent;
|
||||||
|
if (r < 0 || !ismaillock(lockfile, pwd->pw_name)) {
|
||||||
|
if (!quiet) fprintf(stderr,
|
||||||
|
@@ -272,7 +272,7 @@
|
||||||
|
/*
|
||||||
|
* Now we should be able to chdir() to the lock directory.
|
||||||
|
* When we stat("."), it should be the same as at the
|
||||||
|
- * eaccess() check or someone played symlink() games on us.
|
||||||
|
+ * xeaccess() check or someone played symlink() games on us.
|
||||||
|
*/
|
||||||
|
if (chdir(dir) < 0 || stat(".", &st2) < 0) {
|
||||||
|
if (!quiet) fprintf(stderr,
|
||||||
|
--- liblockfile-1.06/lockfile.c 2006/07/10 03:17:40 1.1
|
||||||
|
+++ liblockfile-1.06/lockfile.c 2006/07/10 03:18:26
|
||||||
|
@@ -54,7 +54,7 @@
|
||||||
|
#ifdef LIB
|
||||||
|
static
|
||||||
|
#endif
|
||||||
|
-int eaccess(char *fn, gid_t gid, struct stat *st)
|
||||||
|
+int xeaccess(char *fn, gid_t gid, struct stat *st)
|
||||||
|
{
|
||||||
|
struct stat tmp;
|
||||||
|
uid_t uid = geteuid();
|
||||||
|
@@ -96,7 +96,7 @@
|
||||||
|
*p = 0;
|
||||||
|
else
|
||||||
|
strcpy(dir, ".");
|
||||||
|
- if (eaccess(dir, egid, NULL) >= 0) {
|
||||||
|
+ if (xeaccess(dir, egid, NULL) >= 0) {
|
||||||
|
free(dir);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -111,7 +111,7 @@
|
||||||
|
return 0;
|
||||||
|
mailgid = st.st_gid;
|
||||||
|
}
|
||||||
|
- ret = eaccess(dir, mailgid, NULL) >= 0;
|
||||||
|
+ ret = xeaccess(dir, mailgid, NULL) >= 0;
|
||||||
|
free (dir);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
|
||||||
|
#
|
||||||
|
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||||
|
#
|
||||||
|
|
||||||
|
--- liblockfile-1.05/Makefile.in~install
|
||||||
|
+++ liblockfile-1.05/Makefile.in
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
includedir = @includedir@
|
||||||
|
|
||||||
|
MAILGROUP = @MAILGROUP@
|
||||||
|
+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP))
|
||||||
|
|
||||||
|
all: @TARGETS@
|
||||||
|
install: @INSTALL_TARGETS@
|
||||||
|
@@ -50,25 +51,27 @@
|
||||||
|
$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
|
||||||
|
|
||||||
|
install_static: static install_common
|
||||||
|
+ install -d $(ROOT)$(libdir)
|
||||||
|
install -m 644 liblockfile.a $(ROOT)$(libdir)
|
||||||
|
|
||||||
|
install_shared: shared install_common
|
||||||
|
+ install -d $(ROOT)$(libdir)
|
||||||
|
install -m 755 liblockfile.so \
|
||||||
|
$(ROOT)$(libdir)/liblockfile.so.$(VER)
|
||||||
|
ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
|
||||||
|
if test "$(ROOT)" = ""; then @LDCONFIG@; fi
|
||||||
|
|
||||||
|
install_common:
|
||||||
|
+ install -d $(ROOT)$(includedir)
|
||||||
|
install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
|
||||||
|
- if [ "$(MAILGROUP)" != "" ]; then\
|
||||||
|
- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
|
||||||
|
- else \
|
||||||
|
- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
|
||||||
|
- fi
|
||||||
|
+ install -d $(ROOT)$(bindir)
|
||||||
|
+ install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir)
|
||||||
|
+ install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3
|
||||||
|
install -m 644 *.1 $(ROOT)$(mandir)/man1
|
||||||
|
install -m 644 *.3 $(ROOT)$(mandir)/man3
|
||||||
|
|
||||||
|
install_nfslib: nfslib
|
||||||
|
+ install -d $(ROOT)$(nfslockdir)
|
||||||
|
install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
|
||||||
|
if test "$(ROOT)" = ""; then @LDCONFIG@; fi
|
||||||
|
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
|
||||||
|
#
|
||||||
|
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||||
|
#
|
||||||
|
|
||||||
|
--- liblockfile-1.05/Makefile.in~ldflags
|
||||||
|
+++ liblockfile-1.05/Makefile.in
|
||||||
|
@@ -34,11 +34,11 @@
|
||||||
|
|
||||||
|
liblockfile.so: liblockfile.a
|
||||||
|
$(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
|
||||||
|
- -o liblockfile.so lockfile.o -lc
|
||||||
|
+ -o liblockfile.so lockfile.o $(LDFLAGS) -lc
|
||||||
|
|
||||||
|
nfslock.so.$(VER): nfslock.o
|
||||||
|
$(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
|
||||||
|
- -o nfslock.so.$(NVER) nfslock.o
|
||||||
|
+ -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS)
|
||||||
|
|
||||||
|
dotlockfile: dotlockfile.o xlockfile.o
|
||||||
|
$(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
DESCRIPTION = "File locking library."
|
||||||
|
SECTION = "libs"
|
||||||
|
LICENSE = "LGPLv2+ & GPLv2+"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868b6"
|
||||||
|
|
||||||
|
SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
|
||||||
|
file://install.patch \
|
||||||
|
file://configure.patch \
|
||||||
|
file://ldflags.patch \
|
||||||
|
file://glibc-2.4.patch"
|
||||||
|
|
||||||
|
inherit autotools
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--enable-shared --enable-static"
|
||||||
|
|
||||||
|
do_install () {
|
||||||
|
oe_runmake 'ROOT=${D}' INSTGRP='' install
|
||||||
|
}
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "2de88389da013488bfd31356523070c0"
|
||||||
|
SRC_URI[sha256sum] = "14f9690328318d11f9ba13a9356a2c008bdd169b7a817f38cb7f9eb32cf7240e"
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
DESCRIPTION = "shared library for GIF images"
|
||||||
|
SECTION = "libs"
|
||||||
|
LICENSE = "MIT"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
|
||||||
|
|
||||||
|
SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2"
|
||||||
|
SRC_URI[md5sum] = "8c198831cc0495596c78134b8849e9ad"
|
||||||
|
SRC_URI[sha256sum] = "59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36"
|
||||||
|
|
||||||
|
inherit autotools lib_package
|
||||||
|
|
||||||
|
PACKAGES =+ "${PN}-utils"
|
||||||
|
|
||||||
|
FILES_${PN}-utils = "${bindir}/*"
|
||||||
Reference in New Issue
Block a user