File tree Expand file tree Collapse file tree 2 files changed +34
-0
lines changed Expand file tree Collapse file tree 2 files changed +34
-0
lines changed Original file line number Diff line number Diff line change 1+ diff --git a/nspr-4.8.2/mozilla/nsprpub/pr/tests/Makefile.in b/nspr-4.8.2/mozilla/nsprpub/pr/tests/Makefile.in
2+ index b27e9e5..12418e8 100644
3+ --- a/nspr-4.8.2/mozilla/nsprpub/pr/tests/Makefile.in
4+ +++ b/nspr-4.8.2/mozilla/nsprpub/pr/tests/Makefile.in
5+ @@ -238,7 +238,7 @@ TARGETS = $(PROGS)
6+
7+ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
8+
9+ - ifeq ($(OS_ARCH), WINNT)
10+ + ifeq ($(OS_TARGET), WINNT)
11+ ifdef NS_USE_GCC
12+ EXTRA_LIBS += -lwsock32
13+ else
14+ diff --git a/nspr-4.8.2/mozilla/nsprpub/pr/tests/dll/Makefile.in b/nspr-4.8.2/mozilla/nsprpub/pr/tests/dll/Makefile.in
15+ index da2ae5a..3457493 100644
16+ --- a/nspr-4.8.2/mozilla/nsprpub/pr/tests/dll/Makefile.in
17+ +++ b/nspr-4.8.2/mozilla/nsprpub/pr/tests/dll/Makefile.in
18+ @@ -73,7 +73,7 @@ RESNAME=../../../pr/src/nspr.rc
19+ endif
20+ endif
21+
22+ - ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
23+ + ifeq (,$(filter-out WINNT OS2,$(OS_TARGET)))
24+ IMPORT_LIBRARY = $(OBJDIR)/my.$(LIB_SUFFIX)
25+ SHARED_LIBRARY = $(OBJDIR)/my.dll
26+ ifeq ($(OS_ARCH), OS2)
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ Patch1: nspr-config-pc.patch
2626Patch1000: mingw32-nspr-4.7.2-build.patch
2727Patch1001: mingw32-nspr-4.7.2-extra-build.patch
2828Patch1002: nspr-configure-fedora-cross.patch
29+ Patch1003: mingw32-nspr-4.8.2-test.patch
2930
3031BuildRequires: mingw32-filesystem >= 33
3132BuildRequires: mingw32-gcc
@@ -67,6 +68,7 @@ pushd ./mozilla/nsprpub
6768%patch1000 -p0
6869%patch1001 -p0
6970%patch1002 -p4
71+ %patch1003 -p4
7072popd
7173
7274cp %{SOURCE2 } ./mozilla/nsprpub/config/
@@ -93,6 +95,11 @@ make \
9395 RC= i686-pc-mingw32-windres \
9496 %{?_smp_mflags }
9597
98+ # build the test suite
99+ make -C pr/tests
100+ # XXX this doesn't really work yet
101+ #pr/tests/runtests.sh
102+
96103popd
97104
98105
166173%changelog
167174* Mon Feb 1 2010 Amorilia <amorilia@users.sourceforge.net> - 4.8.2-1
168175- Update to 4.8.2
176+ - Fix for building tests
169177
170178* Sun Jan 31 2010 Amorilia <amorilia@users.sourceforge.net> - 4.8-2
171179- Another fix for build inside mock.
You can’t perform that action at this time.
0 commit comments