Changeset 4 for heimdal/trunk/lib/krb5

Timestamp:

Jul 11, 2015, 9:56:07 AM (10 years ago)

Author:

Paul Smedley

Message:

heimdal: applied os2 patches, added conf.cmd

Location:

heimdal/trunk/lib/krb5

Files:

• Makefile.in (modified) (3 diffs)
• fcache.c (modified) (5 diffs)

heimdal/trunk/lib/krb5/Makefile.in

@@ -13 +13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
+
+OS2_LA_NAME=krb5
+OS2_DLL_NAME=krb5
+OS2_DLL_OBJ=$(libkrb5_la_OBJECTS:%.lo=%.o) 
+OS2_DLL_LIBS=$(LIBS) ../roken/.libs/roken.a ../asn1/.libs/asn1.a ../hcrypto/.libs/hcrypto.a ../wind/.libs/wind.a ../com_err/.libs/com_err.a ../../base/.libs/heimbase.a -lsqlite3 ../hx509/.libs/hx509.a ../ipc/.libs/heim-ipcc.a
 
 @SET_MAKE@
@@ -1040 +1045 @@
         krb5.moduli
 
-all: all-am
+all: all-am $(OS2_DLL_NAME).dll
 
 .SUFFIXES:
@@ -3214 +3219 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
+
+$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la
+        cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a
+        echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > $(OS2_DLL_NAME).def
+        echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
+        echo "EXPORTS" >> $(OS2_DLL_NAME).def
+        emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
+        gcc -g -Zbin-files -Zhigh-mem -Zomf -Zmap -static-libgcc -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS) 
+        emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def
+        emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def

heimdal/trunk/lib/krb5/fcache.c

@@ -74 +74 @@
 {
     int ret;
-#ifdef HAVE_FCNTL
+#if defined(HAVE_FCNTL) && !defined(__OS2__)
     struct flock l;
 
@@ -117 +117 @@
 {
     int ret;
-#ifdef HAVE_FCNTL
+#if defined(HAVE_FCNTL) && !defined(__OS2__)
     struct flock l;
     l.l_start = 0;
@@ -256 +256 @@
         return errno;
 
+#ifndef __OS2__
     fd = open(filename, O_RDWR | O_BINARY);
     if(fd < 0) {
@@ -264 +265 @@
     }
     rk_cloexec(fd);
+
     ret = _krb5_xlock(context, fd, 1, filename);
     if (ret) {
@@ -269 +271 @@
         return ret;
     }
+#endif
     if (unlink(filename) < 0) {
         _krb5_xunlock(context, fd);