[haiku-commits] BRANCH HaikuPM-github.package-management - src/build/libroot
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 5 Apr 2013 18:45:33 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: d4823423996b12ff7332be5dcf97c35c295129a2
new head: daf7cb41c4973f4cd5108bd90bdffc0e6a33c91b
overview: https://github.com/haiku/HaikuPM/compare/d482342...daf7cb4
----------------------------------------------------------------------------
259046a: Fix build without xattrs being used
* need to invoke fs_fopen_attr() instead of fs_open_attr()
daf7cb4: Bring back libroot_build.a for now.
* the corresponding TODO has to be dealt with at a later stage
[ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 6 insertions(+), 6 deletions(-)
src/build/libroot/Jamfile | 8 ++++----
src/build/libroot/fs_attr_generic.cpp | 4 ++--
############################################################################
Commit: 259046a38810367985e7e9f89b90d769eb6380ce
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Fri Apr 5 16:31:58 2013 UTC
Fix build without xattrs being used
* need to invoke fs_fopen_attr() instead of fs_open_attr()
----------------------------------------------------------------------------
diff --git a/src/build/libroot/fs_attr_generic.cpp
b/src/build/libroot/fs_attr_generic.cpp
index ee18e65..d35bd7d 100644
--- a/src/build/libroot/fs_attr_generic.cpp
+++ b/src/build/libroot/fs_attr_generic.cpp
@@ -380,7 +380,7 @@ fs_read_attr(int fd, const char *attribute, uint32 type,
off_t pos,
void *buffer, size_t readBytes)
{
// open the attribute
- int attrFD = fs_open_attr(fd, attribute, type, O_RDONLY);
+ int attrFD = fs_fopen_attr(fd, attribute, type, O_RDONLY);
if (attrFD < 0)
return attrFD;
@@ -405,7 +405,7 @@ fs_write_attr(int fd, const char *attribute, uint32 type,
off_t pos,
const void *buffer, size_t readBytes)
{
// open the attribute
- int attrFD = fs_open_attr(fd, attribute, type,
+ int attrFD = fs_fopen_attr(fd, attribute, type,
O_WRONLY | O_CREAT | O_TRUNC);
if (attrFD < 0)
return attrFD;
############################################################################
Commit: daf7cb41c4973f4cd5108bd90bdffc0e6a33c91b
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Fri Apr 5 16:34:28 2013 UTC
Bring back libroot_build.a for now.
* the corresponding TODO has to be dealt with at a later stage
----------------------------------------------------------------------------
diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile
index 34f947e..bb5e07d 100644
--- a/src/build/libroot/Jamfile
+++ b/src/build/libroot/Jamfile
@@ -81,10 +81,10 @@ BuildPlatformSharedLibrary libroot_build.so :
;
# TODO: This doesn't work with the function remapping.
-#BuildPlatformStaticLibrary libroot_build.a :
-# :
-# [ FGristFiles $(librootSources:S=$(SUFOBJ)) ]
-#;
+BuildPlatformStaticLibrary libroot_build.a :
+ :
+ [ FGristFiles $(librootSources:S=$(SUFOBJ)) ]
+;
USES_BE_API on [ FGristFiles function_remapper$(SUFOBJ) ] = true ;
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management - src/build/libroot - HaikuPM-github . package-management
