1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00

Link libmozab2 too. This is apparently a bug introduced in

1.0 by the OO people. This should fix the setup program.
This commit is contained in:
Martin Blapp 2002-05-19 12:17:30 +00:00
parent 2f7737ce2a
commit 8800bea575
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=59465
23 changed files with 276 additions and 46 deletions

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------

View File

@ -1,6 +1,16 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Mar 11 16:07:41 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Apr 3 00:23:37 2002
@@ -159,7 +159,9 @@
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun May 19 14:10:59 2002
@@ -107,9 +107,7 @@
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP= $(TARGET).map
-.IF "$(OS)"!="FREEBSD"
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-.ENDIF
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
@@ -159,7 +157,9 @@
# --- MOZAB BASE Library -----------------------------------