Changeset 30954 for main/trunk/greenstone2/runtime-src/packages

Timestamp:

2016-10-26T18:39:50+13:00 (8 years ago)

Author:

ak19

Message:

New yaz 2.1.56 was needed to get GS2 compiling to work again on Macs after going from producing dynamic linked to statically linked gnome-lib libraries. The new yaz finally compiles (see recent and current commits). Tested z3950server (built by configuring with --enable-z3950) against built yaz-client, and tested GLI's use of yaz-client against Library of Congress' z3950 server. It all works. Need to test Windows next.

Location:

main/trunk/greenstone2/runtime-src/packages

Files:

• Makefile.in (modified) (2 diffs)
• configure (modified) (1 diff)
• yaz/README.gsdl (modified) (1 diff)

main/trunk/greenstone2/runtime-src/packages/Makefile.in

@@ -40 +40 @@
 ifeq ($(USE_YAZ), 1)
 # we only compile the src and client dirs for now.
-YAZ=yaz/yaz-2.1.4/src yaz/yaz-2.1.4/client 
+YAZ=yaz/yaz-2.1.56/src yaz/yaz-2.1.56/client 
 else
 YAZ=
@@ -126 +126 @@
 # need to do make install in include and src dirs to get the header files and
 # lib file into the right place
-    cd yaz/yaz-2.1.4/include; $(MAKE)  $(MDEFINES) install
-    cd yaz/yaz-2.1.4/src; $(MAKE)  $(MDEFINES) install
+    cd yaz/yaz-2.1.56/include; $(MAKE)  $(MDEFINES) install
+    cd yaz/yaz-2.1.56/src; $(MAKE)  $(MDEFINES) install
 endif
 

main/trunk/greenstone2/runtime-src/packages/configure

@@ -192 +192 @@
   echo ""
   cd "$PACKAGES/yaz" 
-  gzip -dc yaz-2.1.4.tar.gz | tar -xf -
-  cd yaz-2.1.4 && \
+  gzip -dc yaz-2.1.56.tar.gz | tar -xf -
+  cd yaz-2.1.56 && \
     ./configure $CACHE_FILE --prefix="$PACKAGES/yaz" --bindir="$bindir" $HOSTTARGETFLAGS
 else

main/trunk/greenstone2/runtime-src/packages/yaz/README.gsdl

@@ -1 +1 @@
 The YAZ toolkit is used by the GSDL receptionist
 when acting as a z39.50 client.
+
+4. We've moved to Yaz-2.1.56, ak19
+End Oct 2016
+
+EXPLANATION: We've moved to this slightly newer version, the newest in 2.1.* but without changing major version numbers, in order to get a version of yaz that compiles on Macs after changes to make (gnome-lib) libraries statically linked rather than dymamically linked libraries needed for El Capitan.
+
+MODIFIED FILE: yaz-2.1.56/client/client.c
+Still require the same change as in number 3 below.
+
+Ahead of changing to a newer yaz, we've also made changes to the runtime-src/src's z3950 and recpt Makefile.in files, to grab whatever dependencies yaz's configuration step worked out for its Makefile, and then using the same for linking libyaz in z3950 and recept to.
+
+TESTED: bin/linux/z3950server (compile after configuring with --enable-z3950) against yaz-client. Then also tested GLI with Library of Congress's z3950 server at lx2.loc.gov at port 210.
 
 3. CHANGES TO YAZ-2.1.4 TO CREATE THE GREENSTONE VERSION OF IT, ak19