nspr 4.6.6 fails to build

[gjznituv@…]

Building nspr on Leopard 10.5.1 I get this:

--->  Fetching nspr
--->  Attempting to fetch nspr-4.6.6.tar.gz from http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6.6/src/
--->  Verifying checksum(s) for nspr
--->  Extracting nspr
--->  Applying patches to nspr
Error: Target org.macports.patch returned: shell command " cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_nspr/work/nspr-4.6.6/mozilla/nsprpub" && patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/nspr/files/patch-pth.h.diff'" returned error 1
Command output: patching file ./pr/include/md/_pth.h
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file ./pr/include/md/_pth.h.rej

Error: Status 1 encountered during processing.

And on a second attempt the rejects are saved to a different file:

[~] sudo port install nspr
--->  Applying patches to nspr
Error: Target org.macports.patch returned: shell command " cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_nspr/work/nspr-4.6.6/mozilla/nsprpub" && patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/nspr/files/patch-Makefile.in.diff'" returned error 1
Command output: patching file ./pr/src/md/unix/Makefile.in
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file ./pr/src/md/unix/Makefile.in.rej

Error: Status 1 encountered during processing.

The contents of the _pth.h.rej :

***************
*** 205,213 ****
  /*
   * These platforms don't have pthread_kill()
   */
- #if defined(DARWIN)
- #define pthread_kill(thread, sig) ENOSYS
- #endif
  
  #if defined(OSF1) || defined(VMS)
  #define PT_PRIO_MIN            PRI_OTHER_MIN
--- 205,210 ----
  /*
   * These platforms don't have pthread_kill()
   */
  
  #if defined(OSF1) || defined(VMS)
  #define PT_PRIO_MIN            PRI_OTHER_MIN

And of the Makefile.in.rej:

***************
*** 93,99 ****
  
  include $(topsrcdir)/config/rules.mk
  
  export:: $(TARGETS)
  
  ifeq ($(OS_ARCH),SunOS)
  ifneq ($(OS_RELEASE),4.1.3_U1)
--- 93,110 ----
  
  include $(topsrcdir)/config/rules.mk
  
+ ifeq ($(MACOSX_UNIVERSAL),1)
+ os_Darwin_x86.o: os_Darwin_x86.s
+ 	$(CC) -c -o $@ -arch i386 $(subst -arch ppc,,$(CFLAGS)) $<
+ os_Darwin_ppc.o: os_Darwin_ppc.s
+ 	$(CC) -c -o $@ -arch ppc $(subst -arch i386,,$(CFLAGS)) $<
+ os_Darwin_universal.o: os_Darwin_ppc.o os_Darwin_x86.o
+ 	lipo -arch i386 os_Darwin_x86.o -arch ppc os_Darwin_ppc.o -create -output os_Darwin_universal.o
+ 
+ export:: $(TARGETS) os_Darwin_x86.o os_Darwin_ppc.o os_Darwin_universal.o
+ else
  export:: $(TARGETS)
+ endif
  
  ifeq ($(OS_ARCH),SunOS)
  ifneq ($(OS_RELEASE),4.1.3_U1)

[ryandesign (Ryan Carsten Schmidt)]

Cc'ing the port's maintainer.

[rsync@…]

Please find the diff for the portfile attached to the ticket.

Kind regards Thomas Reifferscheid

[ryandesign (Ryan Carsten Schmidt)]

Committed the patch in r32888, and also bumped the port revision. Thanks, Thomas.

[(none)]

Milestone Port Bugs deleted