* timeb was already well deprecated on 4.4BSD

* regen patches
This commit is contained in:
naddy 2013-12-03 21:18:50 +00:00
parent e393892376
commit 89240070cb
2 changed files with 22 additions and 8 deletions

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-unix_Makefile,v 1.3 2004/06/24 21:35:15 sturm Exp $
--- unix/Makefile.orig Mon Mar 1 10:37:24 2004
+++ unix/Makefile Thu Jun 24 15:28:24 2004
$OpenBSD: patch-unix_Makefile,v 1.4 2013/12/03 21:18:50 naddy Exp $
--- unix/Makefile.orig Sun Jan 18 23:41:18 2009
+++ unix/Makefile Tue Dec 3 21:58:13 2013
@@ -42,8 +42,8 @@
# such as -DDOSWILD).
@ -10,9 +10,9 @@ $OpenBSD: patch-unix_Makefile,v 1.3 2004/06/24 21:35:15 sturm Exp $
+#CC = cc# try using "gcc" target rather than changing this (CC and LD
+#LD = $(CC)# must match, else "unresolved symbol: ___main" is possible)
AS = as
LOC = $(LOCAL_UNZIP)
LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
AF = $(LOC)
@@ -61,8 +61,8 @@ FL2 = $(LF2)
@@ -64,8 +64,8 @@ FL2 = $(LF2)
# general-purpose stuff
#CP = cp
@ -23,7 +23,7 @@ $OpenBSD: patch-unix_Makefile,v 1.3 2004/06/24 21:35:15 sturm Exp $
RM = rm -f
CHMOD = chmod
BINPERMS = 755
@@ -449,19 +449,17 @@ svr4package: unzips
@@ -448,19 +448,17 @@ svr4package: unzips
@echo " "
install: $(MANS)
@ -53,8 +53,8 @@ $OpenBSD: patch-unix_Makefile,v 1.3 2004/06/24 21:35:15 sturm Exp $
uninstall:
$(RM) $(INSTALLEDBIN) $(INSTALLEDMAN)
@@ -569,8 +567,6 @@ generic_shlib: unix_make
$(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DUNIX $(LOC)"
@@ -597,8 +595,6 @@ generic_shlib: unix_make
$(MAKE) objsdll CC=gcc CFLAGS="-O3 -Wall -fPIC -DDLL"
gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
$(RM) libunzip.so.0 libunzip.so
- $(LN) -s libunzip.so.0.4 libunzip.so.0

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-unix_unxcfg_h,v 1.1 2013/12/03 21:18:50 naddy Exp $
--- unix/unxcfg.h.orig Thu Apr 16 20:36:12 2009
+++ unix/unxcfg.h Tue Dec 3 22:06:23 2013
@@ -111,7 +111,9 @@ typedef struct stat z_stat;
#ifdef BSD
# include <sys/time.h>
-# include <sys/timeb.h>
+# ifndef BSD4_4
+# include <sys/timeb.h>
+# endif
# if (defined(_AIX) || defined(__GLIBC__) || defined(__GNU__))
# include <time.h>
# endif