Opened 18 years ago
Closed 18 years ago
#11272 closed defect (fixed)
UPDATE: bzip2 1.0.3 -> 1.0.4
Reported by: | pipping@… | Owned by: | ryandesign (Ryan Carsten Schmidt) |
---|---|---|---|
Priority: | Low | Milestone: | |
Component: | ports | Version: | |
Keywords: | bzip2 | Cc: | |
Port: |
Description
Tested to work. Patch attached. Modified Patchfiles attached.
Could someone please test this on SunOS?
Attachments (4)
Change History (10)
Changed 18 years ago by pipping@…
Attachment: | BZIP2_103_104 added |
---|
Changed 18 years ago by pipping@…
Attachment: | patch-Makefile-dylib.diff added |
---|
Changed 18 years ago by pipping@…
Attachment: | patch-Makefile-man.diff added |
---|
Changed 18 years ago by pipping@…
Attachment: | patch-Makefile-so.diff added |
---|
comment:1 Changed 18 years ago by pipping@…
comment:2 Changed 18 years ago by pipping@…
Important: One of the changes in the Makefile from 1.0.3 is:
-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) +CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ->"-fomit-frame-pointer -fno-strength-reduce" is removed, "-g" is added Quote from 1.0.3's patch-Makefile-so.diff for SunOS: -CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) +CFLAGS=-Wall -Winline -O2 -fPIC -fpic -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) ->"-fPIC -fpic" is added Hence this is what I made that section look like in 1.0.4's patch-Makefile-so.diff for SunOS: -CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) +CFLAGS=-Wall -Winline -O2 -g -fPIC -fpic $(BIGFILES) ->"-fPIC -fpic" is added
Opinions on this anyone?
comment:3 Changed 18 years ago by ryandesign (Ryan Carsten Schmidt)
Owner: | changed from macports-dev@… to ryandesign@… |
---|
I took over maintainership of bzip2 and upgraded it to 1.0.4 yesterday in r21374 before finding this ticket. Now I will have to evaluate the patches attached to this ticket to see if they still need to be incorporated.
comment:4 Changed 18 years ago by pipping@…
the sunos variant is broken. i simulated this (under mac os x):
output of "sudo port -vd configure bzip2 -darwin +sunos": http://pastie.caboo.se/34892
DEBUG: Found port in file:///opt/local/var/db/dports/sources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2 DEBUG: Changing to port directory: /opt/local/var/db/dports/sources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2 DEBUG: Requested variant powerpc is not provided by port bzip2. DEBUG: Requested variant macosx is not provided by port bzip2. DEBUG: Executing variant sunos provides sunos DEBUG: Executing com.apple.main (bzip2) ---> Fetching bzip2 DEBUG: Executing com.apple.fetch (bzip2) ---> Verifying checksum(s) for bzip2 DEBUG: Executing com.apple.checksum (bzip2) ---> Checksumming bzip2-1.0.4.tar.gz DEBUG: Correct (md5) checksum for bzip2-1.0.4.tar.gz DEBUG: Correct (sha1) checksum for bzip2-1.0.4.tar.gz DEBUG: Correct (rmd160) checksum for bzip2-1.0.4.tar.gz ---> Extracting bzip2 DEBUG: Executing com.apple.extract (bzip2) ---> Extracting bzip2-1.0.4.tar.gz DEBUG: setting option extract.args to /opt/local/var/db/dports/distfiles/bzip2/bzip2-1.0.4.tar.gz DEBUG: Assembled command: 'cd "/opt/local/var/db/dports/build/_opt_local_var_db_dports_sources_rsync.rsync.macports.org_dpupdate_dports_archivers_bzip2/work" && gzip -dc /opt/local/var/db/dports/distfiles/bzip2/bzip2-1.0.4.tar.gz | /usr/bin /gnutar --no-same-owner -xf -' DEBUG: Executing com.apple.patch (bzip2) ---> Applying patches to bzip2 ---> Applying /opt/local/var/db/dports/sources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2/files/patch-Makefile-man.diff DEBUG: Assembled command: 'cd "/opt/local/var/db/dports/build/_opt_local_var_db_dports_sources_rsync.rsync.macports.org_dpupdate_dports_archivers_bzip2/work/bzip2-1.0.4" && patch -p0' patching file Makefile Hunk #1 succeeded at 72 (offset 12 lines). Hunk #2 succeeded at 83 (offset 12 lines). Hunk #3 succeeded at 99 with fuzz 2 (offset 12 lines). ---> Applying /opt/local/var/db/dports/sources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2/files/patch-Makefile-so.diff DEBUG: Assembled command: 'cd "/opt/local/var/db/dports/build/_opt_local_var_db_dports_sources_rsync.rsync.macports.org_dpupdate_dports_archivers_bzip2/work/bzip2-1.0.4" && patch -p0' patching file Makefile Hunk #1 FAILED at 9. Hunk #2 succeeded at 35 (offset 12 lines). Hunk #3 succeeded at 52 (offset 12 lines). Hunk #4 succeeded at 93 with fuzz 2 (offset 12 lines). Hunk #5 succeeded at 117 with fuzz 2 (offset 11 lines). 1 out of 5 hunks FAILED -- saving rejects to file Makefile.rej Error: Target com.apple.patch returned: shell command "cd "/opt/local/var/db/dports/build/_opt_local_var_db_dports_sources_rsync.rsync.macports.org_dpupdate_dports_archivers_bzip2/work/bzip2-1.0.4" && patch -p0 < "/opt/local/var/db/dports/s ources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2/files/patch-Makefile-so.diff"" returned error 1 Command output: patching file Makefile Hunk #1 FAILED at 9. Hunk #2 succeeded at 35 (offset 12 lines). Hunk #3 succeeded at 52 (offset 12 lines). Hunk #4 succeeded at 93 with fuzz 2 (offset 12 lines). Hunk #5 succeeded at 117 with fuzz 2 (offset 11 lines). 1 out of 5 hunks FAILED -- saving rejects to file Makefile.rej Warning: the following items did not execute (for bzip2): com.apple.configure com.apple.patch Error: Status 1 encountered during processing.
output of "sudo port -vd configure bzip2 +darwin": http://pastie.caboo.se/34893
DEBUG: Found port in file:///opt/local/var/db/dports/sources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2 DEBUG: Changing to port directory: /opt/local/var/db/dports/sources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2 DEBUG: Requested variant powerpc is not provided by port bzip2. DEBUG: Requested variant macosx is not provided by port bzip2. DEBUG: Executing variant darwin provides darwin DEBUG: Executing com.apple.main (bzip2) ---> Fetching bzip2 DEBUG: Executing com.apple.fetch (bzip2) ---> Verifying checksum(s) for bzip2 DEBUG: Executing com.apple.checksum (bzip2) ---> Checksumming bzip2-1.0.4.tar.gz DEBUG: Correct (md5) checksum for bzip2-1.0.4.tar.gz DEBUG: Correct (sha1) checksum for bzip2-1.0.4.tar.gz DEBUG: Correct (rmd160) checksum for bzip2-1.0.4.tar.gz ---> Extracting bzip2 DEBUG: Executing com.apple.extract (bzip2) ---> Extracting bzip2-1.0.4.tar.gz DEBUG: setting option extract.args to /opt/local/var/db/dports/distfiles/bzip2/bzip2-1.0.4.tar.gz DEBUG: Assembled command: 'cd "/opt/local/var/db/dports/build/_opt_local_var_db_dports_sources_rsync.rsync.macports.org_dpupdate_dports_archivers_bzip2/work" && gzip -dc /opt/local/var/db/dports/distfiles/bzip2/bzip2-1.0.4.tar.gz | /usr/bin /gnutar --no-same-owner -xf -' DEBUG: Executing com.apple.patch (bzip2) ---> Applying patches to bzip2 ---> Applying /opt/local/var/db/dports/sources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2/files/patch-Makefile-man.diff DEBUG: Assembled command: 'cd "/opt/local/var/db/dports/build/_opt_local_var_db_dports_sources_rsync.rsync.macports.org_dpupdate_dports_archivers_bzip2/work/bzip2-1.0.4" && patch -p0' patching file Makefile Hunk #1 succeeded at 72 (offset 12 lines). Hunk #2 succeeded at 83 (offset 12 lines). Hunk #3 succeeded at 99 with fuzz 2 (offset 12 lines). ---> Applying /opt/local/var/db/dports/sources/rsync.rsync.macports.org_dpupdate_dports/archivers/bzip2/files/patch-Makefile-dylib.diff DEBUG: Assembled command: 'cd "/opt/local/var/db/dports/build/_opt_local_var_db_dports_sources_rsync.rsync.macports.org_dpupdate_dports_archivers_bzip2/work/bzip2-1.0.4" && patch -p0' patching file Makefile Hunk #1 succeeded at 35 (offset 12 lines). Hunk #2 succeeded at 52 (offset 12 lines). Hunk #3 succeeded at 98 with fuzz 2 (offset 12 lines). Hunk #4 succeeded at 123 with fuzz 2 (offset 11 lines). ---> Configuring bzip2 DEBUG: Executing com.apple.configure (bzip2)
so what fails is the first part of the patch, the one with the cflags (see above)
comment:5 Changed 18 years ago by ryandesign (Ryan Carsten Schmidt)
Please see also #11296 where someone else reported that bzip2 1.0.4 was broken, and committed some changes to fix it.
comment:6 Changed 18 years ago by kballard (Lily Ballard)
Resolution: | → fixed |
---|---|
Status: | new → closed |
Fixed in r21374 by ryandesign@…
should be "enhancement", not "defect". bzip2 1.0.3 works just fine.