mirror of
https://git.freebsd.org/ports.git
synced 2025-06-30 09:00:33 -04:00
72efc09096
- Fix build when ffmpeg-devel is installed [1] [2] - Bring back proxy configuration detection [1] - Minor enhancements [1] Submitted by: George Liaskos [geo.liaskos gmail.com] [1] Reported by: Mickael Maillot [mickael.maillot gmail.com] [2] Obtained from: freebsd-chromium development repository Committed at: FreeBSD Developer Summit 2011
40 lines
1.4 KiB
Python
40 lines
1.4 KiB
Python
--- net/net.gyp.orig 2011-04-26 11:01:16.000000000 +0300
|
|
+++ net/net.gyp 2011-05-03 21:16:49.479149025 +0300
|
|
@@ -138,8 +138,8 @@
|
|
'base/network_change_notifier_linux.h',
|
|
'base/network_change_notifier_mac.cc',
|
|
'base/network_change_notifier_mac.h',
|
|
- 'base/network_change_notifier_netlink_linux.cc',
|
|
- 'base/network_change_notifier_netlink_linux.h',
|
|
+ #'base/network_change_notifier_netlink_linux.cc',
|
|
+ #'base/network_change_notifier_netlink_linux.h',
|
|
'base/network_change_notifier_win.cc',
|
|
'base/network_change_notifier_win.h',
|
|
'base/network_config_watcher_mac.cc',
|
|
@@ -245,7 +245,7 @@
|
|
'dependencies': [
|
|
'../build/linux/system.gyp:gconf',
|
|
'../build/linux/system.gyp:gdk',
|
|
- '../build/linux/system.gyp:libresolv',
|
|
+ #'../build/linux/system.gyp:libresolv',
|
|
],
|
|
'conditions': [
|
|
['use_openssl==1', {
|
|
@@ -1023,7 +1023,7 @@
|
|
],
|
|
}
|
|
],
|
|
- [ 'OS == "linux"', {
|
|
+ [ 'OS == "linux" or OS=="freebsd"', {
|
|
'conditions': [
|
|
['linux_use_tcmalloc==1', {
|
|
'dependencies': [
|
|
@@ -1196,7 +1196,7 @@
|
|
}],
|
|
],
|
|
}],
|
|
- ['OS == "linux"', {
|
|
+ ['OS == "linux" or OS=="freebsd"', {
|
|
'conditions': [
|
|
['linux_use_tcmalloc==1', {
|
|
'dependencies': [
|