Before I submit a problem report I thought I'd ask whether it's a
known issue, or maybe not an issue at all.
'patch' is supposed to be flexible enough to find the places to apply
patches even when the context doesn't match in 100% - yet it doesn't
seem to work that reliably on OpenBSD. For comparison output from a
linux box, and the offending files attached inline.
Linux box:
$ patch --version
patch 2.5.4
<cut some licencing>
$ patch -p4 < irssi.src.silc.core.Makefile.am.patch
patching file Makefile.am
Hunk #3 succeeded at 54 with fuzz 2 (offset 2 lines).
$ tail -n 13 Makefile.am
silc-servers.h \
silc-chatnets.h \
silc-cmdqueue.h
.libs/silc.a:
if [ ! -d .libs ]; then mkdir .libs ; fi
rm -f .libs/silc.a
$(LN_S) $(silc_top_srcdir)/lib/.libs/libsilc.a .libs/silc.a
.libs/silcclient.a:
if [ ! -d .libs ]; then mkdir .libs ; fi
rm -f .libs/silcclient.a
$(LN_S) $(silc_top_srcdir)/lib/.libs/libsilcclient.a .libs/silcclient.a
Now the same stuff on OpenBSD:
$ patch --version
Patch version 2.0-12u8-OpenBSD
$ patch -p4 < irssi.src.silc.core.Makefile.am.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -Naur irssi-0.8.9.orig/src/silc/core/Makefile.am
irssi-0.8.9/src/silc/core/Makefile.am
|--- irssi-0.8.9.orig/src/silc/core/Makefile.am Thu Jan 15 16:37:25 2004
|+++ irssi-0.8.9/src/silc/core/Makefile.am Thu Jan 15 16:45:15 2004
--------------------------
Patching file Makefile.am using Plan A...
Hunk #1 succeeded at 2.
Hunk #2 succeeded at 13.
Hunk #3 succeeded at 52 with fuzz 2.
done
$ tail -n 13 Makefile.am
silc-servers.h \
silc-chatnets.h \
.libs/silc.a:
if [ ! -d .libs ]; then mkdir .libs ; fi
rm -f .libs/silc.a
$(LN_S) $(silc_top_srcdir)/lib/.libs/libsilc.a .libs/silc.a
.libs/silcclient.a:
if [ ! -d .libs ]; then mkdir .libs ; fi
rm -f .libs/silcclient.a
$(LN_S) $(silc_top_srcdir)/lib/.libs/libsilcclient.a .libs/silcclient.a
silc-cmdqueue.h
Notice the difference right above ".libs/silc.a"
So, is this a problem I should report?
The patch file is taken from
<http://penguin-breeder.org/silc/download/silc-plugin-1.0.3.tar.gz>,
from silc-plugin-1.0.3/patches/, while Makefile.am is from
<http://silcnet.org/download/client/sources/silc-client-1.0.3.tar.gz>,
from silc-client-1.0.3/apps/irssi/src/silc/core/
$ cat irssi.src.silc.core.Makefile.am.patch
diff -Naur irssi-0.8.9.orig/src/silc/core/Makefile.am
irssi-0.8.9/src/silc/core/Makefile.am
--- irssi-0.8.9.orig/src/silc/core/Makefile.am Thu Jan 15 16:37:25 2004
+++ irssi-0.8.9/src/silc/core/Makefile.am Thu Jan 15 16:45:15 2004
@@ -2,6 +2,8 @@
IRSSI_INCLUDE=../../..
+moduledir = $(libdir)/irssi/modules
+
ADD_INCLUDES = \
$(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \
-DSYSCONFDIR=\""$(silc_etcdir)"\" \
@@ -11,9 +13,21 @@
-I$(IRSSI_INCLUDE)/src/fe-common/core \
-I$(IRSSI_INCLUDE)/src/fe-common/silc
-noinst_LIBRARIES=libsilc_core.a
+module_LTLIBRARIES=libsilc_core.la
+
+libsilc_core_la_LDFLAGS = \
+ -avoid-version \
+ -rpath $(moduledir)
+
+libsilc_core_la_DEPENDENCIES = \
+ .libs/silc.a \
+ .libs/silcclient.a
-libsilc_core_a_SOURCES = \
+libsilc_core_la_LIBADD = \
+ libsilc.la \
+ libsilcclient.la
+
+libsilc_core_la_SOURCES = \
client_ops.c \
clientutil.c \
silc-channels.c \
@@ -38,3 +52,12 @@
silc-servers.h \
silc-chatnets.h
+.libs/silc.a:
+ if [ ! -d .libs ]; then mkdir .libs ; fi
+ rm -f .libs/silc.a
+ $(LN_S) $(silc_top_srcdir)/lib/.libs/libsilc.a .libs/silc.a
+
+.libs/silcclient.a:
+ if [ ! -d .libs ]; then mkdir .libs ; fi
+ rm -f .libs/silcclient.a
+ $(LN_S) $(silc_top_srcdir)/lib/.libs/libsilcclient.a .libs/silcclient.a
$ cat Makefile.am
include $(top_srcdir)/Makefile.defines.in
IRSSI_INCLUDE=../../..
ADD_INCLUDES = \
$(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \
-DSYSCONFDIR=\""$(silc_etcdir)"\" \
-I$(IRSSI_INCLUDE) \
-I$(IRSSI_INCLUDE)/src \
-I$(IRSSI_INCLUDE)/src/core \
-I$(IRSSI_INCLUDE)/src/fe-common/core \
-I$(IRSSI_INCLUDE)/src/fe-common/silc
noinst_LIBRARIES=libsilc_core.a
libsilc_core_a_SOURCES = \
client_ops.c \
clientutil.c \
silc-channels.c \
silc-core.c \
silc-nicklist.c \
silc-queries.c \
silc-servers.c \
silc-expandos.c \
silc-servers-reconnect.c \
silc-lag.c \
silc-chatnets.c \
silc-cmdqueue.c
noinst_HEADERS = \
module.h \
client_ops.h \
clientutil.h \
silc-channels.h \
silc-core.h \
silc-nicklist.h \
silc-commands.h \
silc-queries.h \
silc-servers.h \
silc-chatnets.h \
silc-cmdqueue.h
$ head -n 2 /var/run/dmesg.boot
OpenBSD 4.0-beta (GENERIC) #1091: Sun Aug 27 17:06:08 MDT 2006
[EMAIL PROTECTED]:/usr/src/sys/arch/i386/compile/GENERIC
Any other information I forgot to attach?
--
viq
