hrev49299 adds 2 changesets to branch 'master'
old head: f15fb39b204ef2d30cbed43139a467671718b307
new head: b2b4946fa0191c3e0c3214c5c9c63de30f5e51b6
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=b2b4946fa019+%5Ef15fb39b204e
----------------------------------------------------------------------------
d465855013b9: netresolv: enable IPv6, remove useless Jamfile stuff
b2b4946fa019: usb_webcam: move header generation to multiarch block
* With the HDRGRIST change the headers must now be generated for each
architecture.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 8 insertions(+), 14 deletions(-)
src/add-ons/media/media-add-ons/usb_webcam/Jamfile | 15 +++++++--------
src/kits/network/netresolv/Jamfile | 7 +------
############################################################################
Commit: d465855013b9da20240bb2703aaf9da1dc136fdc
URL: http://cgit.haiku-os.org/haiku/commit/?id=d465855013b9
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Mon Jun 15 17:36:19 2015 UTC
netresolv: enable IPv6, remove useless Jamfile stuff
----------------------------------------------------------------------------
diff --git a/src/kits/network/netresolv/Jamfile
b/src/kits/network/netresolv/Jamfile
index 0a4a4ec..a1d2e87 100644
--- a/src/kits/network/netresolv/Jamfile
+++ b/src/kits/network/netresolv/Jamfile
@@ -5,15 +5,10 @@ for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
-#HDRGRIST = [ FGrist $(SUBDIR_TOKENS) $(architecture) ] ;
-
UseHeaders [ FDirName $(SUBDIR) include ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat
freebsd_network compat ]
: true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ]
: true ;
- UseHeaders [ FDirName
-
$(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCHS[1]))
- kits network netresolv ] ;
SubDirSysHdrs $(SUBDIR) ;
# private sources for this port
@@ -31,7 +26,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
{
# we want to have the xxx_r functions, IPv6, and md5
implementation
# we also need to use our BSD compatibility functions
- local defines = _REENTRANT=1 USE_MD5=1 _BSD_SOURCE ;
+ local defines = _REENTRANT=1 USE_MD5=1 _BSD_SOURCE IPV6
;
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ;
############################################################################
Revision: hrev49299
Commit: b2b4946fa0191c3e0c3214c5c9c63de30f5e51b6
URL: http://cgit.haiku-os.org/haiku/commit/?id=b2b4946fa019
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Mon Jun 15 18:19:59 2015 UTC
usb_webcam: move header generation to multiarch block
* With the HDRGRIST change the headers must now be generated for each
architecture.
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
index 5cebfc9..8d3eb6b 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
+++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
@@ -80,18 +80,17 @@ actions USBWebcamHeaderGen1
}
-USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC
- : $(addonSources) ;
-USBWebcamHeaderGen CamInternalSensors.h : B_WEBCAM_DECLARE_SENSOR
- : $(sensorsSources) ;
-USBWebcamHeaderGen CamInternalColorSpaceTransforms.h
- : B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ;
-
-
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
+ USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC
+ : $(addonSources) ;
+ USBWebcamHeaderGen CamInternalSensors.h :
B_WEBCAM_DECLARE_SENSOR
+ : $(sensorsSources) ;
+ USBWebcamHeaderGen CamInternalColorSpaceTransforms.h
+ : B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources)
;
+
for sourceDir in $(sourceDirs) {
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons
media
media-add-ons usb_webcam $(sourceDir) ] ;
