update to libgpg-error-1.1

USE_LIBTOOL
This commit is contained in:
sturm 2005-12-04 17:21:09 +00:00
parent a6bcab8d25
commit 80ba02d4ff
7 changed files with 23 additions and 106 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2004/12/27 13:28:34 alek Exp $
# $OpenBSD: Makefile,v 1.4 2005/12/04 17:21:09 sturm Exp $
COMMENT= "error codes for GnuPG related software"
DISTNAME= libgpg-error-0.7
DISTNAME= libgpg-error-1.1
CATEGORIES= security devel
MAINTAINER= Nikolay Sturm <sturm@openbsd.org>
@ -14,14 +14,15 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/ \
ftp://gd.tuwien.ac.at/privacy/gnupg/alpha/libgpg-error/ \
http://ftp.planetmirror.com/pub/gnupg/alpha/libgpg-error/ \
http://sunsite.dk/pub/security/gcrypt/alpha/libgpg-error/ \
http://ftp.linux.it/pub/mirrors/gnupg/alpha/libgpg-error/
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
ftp://gd.tuwien.ac.at/privacy/gnupg/libgpg-error/ \
http://sunsite.dk/pub/security/gcrypt/libgpg-error/ \
http://ftp.linux.it/pub/mirrors/gnupg/libgpg-error/
MODULES= devel/gettext
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE=gnu

View File

@ -1,4 +1,4 @@
MD5 (libgpg-error-0.7.tar.gz) = 5340fa28c365049c995996e8dc0f880c
RMD160 (libgpg-error-0.7.tar.gz) = 626404321a90da044114e1c07a66215468bb34e1
SHA1 (libgpg-error-0.7.tar.gz) = edc85d3ca11d72971d59024ef419b4a20d9dd8d7
SIZE (libgpg-error-0.7.tar.gz) = 312770
MD5 (libgpg-error-1.1.tar.gz) = ee23cdd5fbbb1483676647a8e091ff8e
RMD160 (libgpg-error-1.1.tar.gz) = a5da35d88f7100dfedfedbfab429e1c441375643
SHA1 (libgpg-error-1.1.tar.gz) = ded0aef347e69b6bc3605a8ea4936dc82f9be902
SIZE (libgpg-error-1.1.tar.gz) = 311871

View File

@ -1,55 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/05/07 20:26:19 sturm Exp $
--- ltmain.sh.orig 2004-04-16 18:53:42.000000000 +0200
+++ ltmain.sh 2004-04-16 18:57:11.000000000 +0200
@@ -1775,10 +1775,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
@@ -4577,40 +4573,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2004/05/07 20:26:19 sturm Exp $
--- src/Makefile.in.orig 2004-03-07 21:25:50.000000000 +0100
+++ src/Makefile.in 2004-04-17 16:39:31.000000000 +0200
@@ -191,11 +191,11 @@ libgpg_error_la_SOURCES = gpg-error.h ge
strsource.c strerror.c code-to-errno.c code-from-errno.c
-libgpg_error_la_LIBADD = @LTLIBINTL@
+libgpg_error_la_LIBADD =
bin_PROGRAMS = gpg-error
gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
-gpg_error_LDADD = ./libgpg-error.la
+gpg_error_LDADD = ./libgpg-error.la $(LTLIBINTL)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -650,10 +650,10 @@ mkerrcodes.h: Makefile mkerrcodes.awk
# It is correct to use $(CC_FOR_BUILD) here. We want to run the
# program at build time.
mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile
- $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $<
+ $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
code-from-errno.h: mkerrcodes Makefile
- ./$< | $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@
+ ./mkerrcodes | $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@
errnos-sym.h: Makefile mkstrtable.awk errnos.in
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-tests_Makefile_in,v 1.1.1.1 2004/05/07 20:26:19 sturm Exp $
--- tests/Makefile.in.orig 2004-03-07 21:25:50.000000000 +0100
+++ tests/Makefile.in 2004-04-17 16:28:14.000000000 +0200
@@ -175,7 +175,7 @@ PROGRAMS = $(noinst_PROGRAMS)
$OpenBSD: patch-tests_Makefile_in,v 1.2 2005/12/04 17:21:09 sturm Exp $
--- tests/Makefile.in.orig Mon Jun 20 20:35:10 2005
+++ tests/Makefile.in Mon Oct 31 09:17:44 2005
@@ -76,7 +76,7 @@ am__EXEEXT_1 = t-strerror$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
t_strerror_SOURCES = t-strerror.c
t_strerror_OBJECTS = t-strerror.$(OBJEXT)
-t_strerror_LDADD = $(LDADD)
+t_strerror_LDADD = $(LDADD) @LTLIBINTL@
t_strerror_DEPENDENCIES = ../src/libgpg-error.la
t_strerror_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 18:36:00 espie Exp $
@lib lib/libgpg-error.so.1.2
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/04 17:21:09 sturm Exp $
@lib lib/libgpg-error.so.1.4

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/05/07 20:26:19 sturm Exp $
@comment $OpenBSD: PLIST,v 1.2 2005/12/04 17:21:09 sturm Exp $
bin/gpg-error
bin/gpg-error-config
include/gpg-error.h
@ -6,4 +6,5 @@ lib/libgpg-error.a
lib/libgpg-error.la
share/aclocal/gpg-error.m4
share/locale/de/LC_MESSAGES/libgpg-error.mo
share/locale/pl/LC_MESSAGES/libgpg-error.mo
%%SHARED%%