Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
ff4ee38a
Commit
ff4ee38a
authored
Oct 6, 2014
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
contrib: don't trust pkg-config for pcre on OSX
Refs #56954 Change-Id: I1db4fe3ae0e011562b551efd1808cb7aec3490e1
parent
ffcb8d41
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/contrib/src/pcre/rules.mak
+4
-0
4 additions, 0 deletions
daemon/contrib/src/pcre/rules.mak
with
4 additions
and
0 deletions
daemon/contrib/src/pcre/rules.mak
+
4
−
0
View file @
ff4ee38a
...
@@ -4,9 +4,13 @@ PCRE_VERSION := 8.35
...
@@ -4,9 +4,13 @@ PCRE_VERSION := 8.35
PCRE_URL
:=
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-
$(
PCRE_VERSION
)
.tar.bz2
PCRE_URL
:=
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-
$(
PCRE_VERSION
)
.tar.bz2
PKGS
+=
pcre
PKGS
+=
pcre
# OS X ships with improperly packaged libpcre, so we can't rely on pkg-config
ifndef
HAVE_MACOSX
ifeq
($(call need_pkg,"libpcre"),)
ifeq
($(call need_pkg,"libpcre"),)
PKGS_FOUND
+=
pcre
PKGS_FOUND
+=
pcre
endif
endif
endif
$(TARBALLS)/pcre-$(PCRE_VERSION).tar.bz2
:
$(TARBALLS)/pcre-$(PCRE_VERSION).tar.bz2
:
$(
call download,
$(
PCRE_URL
))
$(
call download,
$(
PCRE_URL
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment