Example cross-zlib package.

diff --git a/.hgignore b/.hgignore
index 5caf84f..e8a0f87 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -21,6 +21,7 @@ cairo/cairo-1.7.4.tar.gz
 cairo/cairo-1.8.0.tar.gz
 cairo/svgspacewar
 cairomm/cairomm-1.6.2.tar.gz
+cross-zlib/zlib-1.2.3.tar.gz
 curl/curl-7.18.2.tar.bz2
 curl/test1
 darwinx-gcc/gcc_42-5566.tar.gz

diff --git a/IGNORE b/IGNORE
index a959157..cb6bb29 100644 (file)
--- a/IGNORE
+++ b/IGNORE
@@ -1,5 +1,6 @@
 # List of packages that are ignored when building, updating status, etc.
 example
+cross-zlib
 cyrus-sasl
 darwinx-gcc
 dbus

diff --git a/cross-zlib/README b/cross-zlib/README
new file mode 100644 (file)
index 0000000..e01fa40
--- /dev/null
+++ b/cross-zlib/README
@@ -0,0 +1,6 @@
+This is an experimental package to look at our options for packaging
+libraries for Win32/Win64/Darwin in the Fedora 12 timeframe.
+
+Please see this thread for more information:
+
+http://lists.fedoraproject.org/pipermail/fedora-mingw/2009-February/thread.html#464

diff --git a/cross-zlib/mingw32-zlib.spec b/cross-zlib/mingw32-zlib.spec
new file mode 100644 (file)
index 0000000..288c9c8
--- /dev/null
+++ b/cross-zlib/mingw32-zlib.spec
@@ -0,0 +1,191 @@
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name:           mingw32-zlib
+Version:        1.2.3
+Release:        13%{?dist}
+Summary:        Cross-compiled zlib compression library
+
+License:        zlib
+Group:          Development/Libraries
+URL:            http://www.zlib.net/
+Source0:        http://www.zlib.net/zlib-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+# From Fedora native package, none is applicable to us.
+#Patch3:        zlib-1.2.3-autotools.patch
+#Patch4:        minizip-1.2.3-autotools.patch
+#Patch5:        zlib-1.2.3-minizip.patch
+
+# MinGW-specific patches.
+Patch100:       zlib-win32.patch
+
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw64-filesystem >= 10
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+
+
+%description
+Cross-compiled zlib compression library.
+
+
+%package -n mingw64-zlib
+Summary:        Cross-compiled zlib compression library
+Group:          Development/Libraries
+
+
+%description -n mingw64-zlib
+Cross-compiled zlib compression library.
+
+
+%prep
+%setup -q -c -n %{name}-%{version} -a 0
+mv zlib-%{version} mingw32
+%setup -q -c -D -n %{name}-%{version} -a 0
+mv zlib-%{version} mingw64
+
+pushd mingw32
+%patch100 -p1
+popd
+
+pushd mingw64
+%patch100 -p1
+popd
+
+
+%build
+pushd mingw32
+
+CC=%{_mingw32_cc} \
+CFLAGS="%{_mingw32_cflags}" \
+RANLIB=%{_mingw32_ranlib} \
+./configure
+
+make -f win32/Makefile.gcc \
+  CFLAGS="%{_mingw32_cflags}" \
+  CC=%{_mingw32_cc} \
+  AR=%{_mingw32_ar} \
+  RC=%{_mingw32_windres} \
+  DLLWRAP=%{_mingw32_dllwrap} \
+  STRIP=%{_mingw32_strip} \
+  all
+
+popd
+
+pushd mingw64
+
+CC=%{_mingw64_cc} \
+CFLAGS="%{_mingw64_cflags}" \
+RANLIB=%{_mingw64_ranlib} \
+./configure
+
+make -f win32/Makefile.gcc \
+  CFLAGS="%{_mingw64_cflags}" \
+  CC=%{_mingw64_cc} \
+  AR=%{_mingw64_ar} \
+  RC=%{_mingw64_windres} \
+  DLLWRAP=%{_mingw64_dllwrap} \
+  STRIP=%{_mingw64_strip} \
+  all
+
+popd
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+pushd mingw32
+
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
+
+make -f win32/Makefile.gcc \
+     INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw32_includedir} \
+     LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw32_libdir} \
+     BINARY_PATH=$RPM_BUILD_ROOT%{_mingw32_bindir} \
+     install
+
+# .dll.a file is misnamed for some reason - fix that.
+mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libzdll.a \
+   $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.dll.a
+
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libz.a
+
+popd
+
+pushd mingw64
+
+mkdir -p $RPM_BUILD_ROOT%{_mingw64_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw64_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_mingw64_libdir}
+
+make -f win32/Makefile.gcc \
+     INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw64_includedir} \
+     LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw64_libdir} \
+     BINARY_PATH=$RPM_BUILD_ROOT%{_mingw64_bindir} \
+     install
+
+# .dll.a file is misnamed for some reason - fix that.
+mv $RPM_BUILD_ROOT%{_mingw64_libdir}/libzdll.a \
+   $RPM_BUILD_ROOT%{_mingw64_libdir}/libz.dll.a
+
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw64_libdir}/libz.a
+
+popd
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{_mingw32_includedir}/zconf.h
+%{_mingw32_includedir}/zlib.h
+%{_mingw32_libdir}/libz.dll.a
+%{_mingw32_bindir}/zlib1.dll
+
+
+%files -n mingw64-zlib
+%defattr(-,root,root)
+%{_mingw64_includedir}/zconf.h
+%{_mingw64_includedir}/zlib.h
+%{_mingw64_libdir}/libz.dll.a
+%{_mingw64_bindir}/zlib1.dll
+
+
+%changelog
+* Mon Jan 19 2009 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-12
+- Force rebuild to test maintenance account.
+
+* Thu Dec 18 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-11
+- Pass correct CFLAGS to build.
+
+* Thu Oct 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-10
+- Consider native patches.
+
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-9
+- Rename mingw -> mingw32.
+
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-8
+- Remove manpage.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-7
+- Remove static library.
+
+* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-5
+- Fix misnamed file: zlibdll.a -> zlib.dll.a
+- Explicitly provide mingw(zlib1.dll).
+
+* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-3
+- Initial RPM release, largely based on earlier work from several sources.

diff --git a/cross-zlib/zlib-win32.patch b/cross-zlib/zlib-win32.patch
new file mode 100644 (file)
index 0000000..23beea6
--- /dev/null
+++ b/cross-zlib/zlib-win32.patch
@@ -0,0 +1,41 @@
+diff -rup zlib-1.2.3.orig/win32/Makefile.gcc zlib-1.2.3.new/win32/Makefile.gcc
+--- zlib-1.2.3.orig/win32/Makefile.gcc 2003-08-01 23:49:00.000000000 -0400
++++ zlib-1.2.3.new/win32/Makefile.gcc  2008-09-02 08:24:44.000000000 -0400
+@@ -45,6 +45,9 @@ ARFLAGS = rcs
+ RC = windres
+ RCFLAGS = --define GCC_WINDRES
+ 
++DLLWARP = dllwrap
++STRIP = strip
++
+ CP = cp -fp
+ # If GNU install is available, replace $(CP) with install.
+ INSTALL = $(CP)
+@@ -79,9 +82,9 @@ $(STATICLIB): $(OBJS) $(OBJA)
+ $(IMPLIB): $(SHAREDLIB)
+ 
+ $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+-      dllwrap --driver-name $(CC) --def win32/zlib.def \
++      $(DLLWRAP) --driver-name $(CC) --def win32/zlib.def \
+         --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o
+-      strip $@
++      $(STRIP) $@
+ 
+ example: example.o $(STATICLIB)
+       $(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
+@@ -104,12 +107,13 @@ zlibrc.o: win32/zlib1.rc
+ .PHONY: install uninstall clean
+ 
+ install: zlib.h zconf.h $(LIB)
+-      -@if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH)
+-      -@if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH)
++      -mkdir -p $(INCLUDE_PATH)
++      -mkdir -p $(LIBRARY_PATH)
+       -$(INSTALL) zlib.h $(INCLUDE_PATH)
+       -$(INSTALL) zconf.h $(INCLUDE_PATH)
+       -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
+       -$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
++      -$(INSTALL) $(SHAREDLIB) $(BINARY_PATH)
+ 
+ uninstall:
+       -$(RM) $(INCLUDE_PATH)/zlib.h