Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: brianmario/charlock_holmes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pullreq/charlock_holmes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Dec 13, 2013

  1. Update libmagic; link system ICU on Darwin; use RbConfig CFLAGS, etc. 

    This pull request includes changes intended to allow the resolution of #29, #40, #42 (partial), #43, #49, #50, #51, #52.

- file/libmagic (and patch) updated to 5.16.
- extconf.rb modified to:
  - enforce RbConfig compiler and related flags.
  - fix for non-GNU 'make' (ie, no ```make -C```).
  - remove 'dst' build directory after compiling.
  - **Build and link against system ICU on Darwin.**
    I've included a minimal subset of the ICU headers in ```darwin-icu-headers.tar.gz```,
    taken from the [Apple ICU](http://www.opensource.apple.com/source/ICU/ICU-461.18) source (Apple doesn't distribute these headers because they prefer you use their client frameworks like Core Text, etc., but they're available freely at the link above). These headers are from the version bundled with 10.7 (10.6 was too old, so I've retained the check for homebrew icu4c on older versions).

    I've tested that they work on 10.9, so presumably it should work on 10.7 and 10.8 as well.
    If anyone can confirm that, that would be great.

    I think perhaps this is a better solution than relying on ```brew install icu4c```?
    Geoff
    Geoff committed Dec 13, 2013
    Configuration menu
    Copy the full SHA
    a1b3d7c View commit details
    Browse the repository at this point in the history
Loading