Siju, sorry, I don't really know. just apply it manually, but I see no reason for it to fail.
Cheers, Alex On 13/09/11 07:11, Siju George wrote: > Hi, > > Please Alex, Marino or some one give me a clue on why this failed? > > Am I using a wrong version of src? > > Thanks > > On Mon, Aug 29, 2011 at 11:42 AM, Siju George <sgeorge...@gmail.com> wrote: >> >> On Wed, Aug 24, 2011 at 6:38 PM, Alex Hornung <ahorn...@gmail.com> wrote: >>> http://gitweb.dragonflybsd.org/dragonfly.git/commit/e7322b09faff75b1298e9bfe444633425d173536 >>> >> >> Hi I wonder if i made any mistake in patching. >> Please see and help >> >> Thanks >> >> --Siju >> >> blk-build# patch < pthread.h-diff >> Hmm... Looks like a unified diff to me... >> The text leading up to this was: >> -------------------------- >> |--- a/include/pthread.h >> |+++ b/include/pthread.h >> -------------------------- >> File to patch: include/pthread.h >> Patching file include/pthread.h using Plan A... >> Hunk #1 failed at 140. >> 1 out of 1 hunks failed--saving rejects to include/pthread.h.rej >> done >> blk-build# pwd >> /usr/src >> blk-build# git describe >> v2.11.0-743-g593fea8 >> blk-build# cat include/pthread.h.rej >> @@ -140,136 +140,136 @@ >> * Thread function prototype definitions: >> */ >> __BEGIN_DECLS >> -int pthread_atfork(void (*)(void), void (*)(void), void >> (*)(void)); >> -int pthread_attr_destroy(pthread_attr_t *); >> +int pthread_atfork(void (*)(void), void (*)(void), void >> (*)(void)) __exported; >> +int pthread_attr_destroy(pthread_attr_t *) __exported; >> int pthread_attr_getguardsize(const pthread_attr_t * __restrict, >> - size_t *); >> + size_t *) __exported; >> int pthread_attr_getstack(const pthread_attr_t * __restrict, >> - void ** __restrict, size_t * >> __restrict); >> -int pthread_attr_getstacksize(const pthread_attr_t *, size_t *); >> -int pthread_attr_getstackaddr(const pthread_attr_t *, void **); >> -int pthread_attr_getdetachstate(const pthread_attr_t *, int *); >> -int pthread_attr_init(pthread_attr_t *); >> -int pthread_attr_setguardsize(pthread_attr_t *, size_t); >> -int pthread_attr_setstack(pthread_attr_t *, void *, size_t); >> -int pthread_attr_setstacksize(pthread_attr_t *, size_t); >> -int pthread_attr_setstackaddr(pthread_attr_t *, void *); >> -int pthread_attr_setdetachstate(pthread_attr_t *, int); >> -int pthread_barrier_destroy(pthread_barrier_t *); >> + void ** __restrict, size_t * >> __restrict) __exported; >> +int pthread_attr_getstacksize(const pthread_attr_t *, >> size_t *) __exported; >> +int pthread_attr_getstackaddr(const pthread_attr_t *, void >> **) __exported; >> +int pthread_attr_getdetachstate(const pthread_attr_t *, >> int *) __exported; >> +int pthread_attr_init(pthread_attr_t *) __exported; >> +int pthread_attr_setguardsize(pthread_attr_t *, size_t) >> __exported; >> +int pthread_attr_setstack(pthread_attr_t *, void *, >> size_t) __exported; >> +int pthread_attr_setstacksize(pthread_attr_t *, size_t) >> __exported; >> +int pthread_attr_setstackaddr(pthread_attr_t *, void *) >> __exported; >> +int pthread_attr_setdetachstate(pthread_attr_t *, int) >> __exported; >> +int pthread_barrier_destroy(pthread_barrier_t *) __exported; >> int pthread_barrier_init(pthread_barrier_t *, >> - const pthread_barrierattr_t *, unsigned); >> -int pthread_barrier_wait(pthread_barrier_t *); >> -int pthread_barrierattr_destroy(pthread_barrierattr_t *); >> -int pthread_barrierattr_init(pthread_barrierattr_t *); >> + const pthread_barrierattr_t *, unsigned) __exported; >> +int pthread_barrier_wait(pthread_barrier_t *) __exported; >> +int pthread_barrierattr_destroy(pthread_barrierattr_t *) >> __exported; >> +int pthread_barrierattr_init(pthread_barrierattr_t *) __exported; >> int pthread_barrierattr_getpshared(const pthread_barrierattr_t *, >> - int *); >> -int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int); >> -void pthread_cleanup_pop(int); >> -void pthread_cleanup_push(void (*) (void *), void *); >> -int pthread_condattr_destroy(pthread_condattr_t *); >> -int pthread_condattr_init(pthread_condattr_t *); >> + int *) __exported; >> +int pthread_barrierattr_setpshared(pthread_barrierattr_t >> *, int) __exported; >> +void pthread_cleanup_pop(int) __exported; >> +void pthread_cleanup_push(void (*) (void *), void *) __exported; >> +int pthread_condattr_destroy(pthread_condattr_t *) __exported; >> +int pthread_condattr_init(pthread_condattr_t *) __exported; >> >> -int pthread_condattr_getpshared(const pthread_condattr_t *, int >> *); >> -int pthread_condattr_setpshared(pthread_condattr_t *, int); >> +int pthread_condattr_getpshared(const pthread_condattr_t >> *, int *) __exported; >> +int pthread_condattr_setpshared(pthread_condattr_t *, int) >> __exported; >> >> -int pthread_condattr_getclock(const pthread_condattr_t *, >> clockid_t *); >> -int pthread_condattr_setclock(pthread_condattr_t *, clockid_t); >> +int pthread_condattr_getclock(const pthread_condattr_t *, >> clockid_t *) __exported; >> +int pthread_condattr_setclock(pthread_condattr_t *, >> clockid_t) __exported; >> >> -int pthread_cond_broadcast(pthread_cond_t *); >> -int pthread_cond_destroy(pthread_cond_t *); >> +int pthread_cond_broadcast(pthread_cond_t *) __exported; >> +int pthread_cond_destroy(pthread_cond_t *) __exported; >> int pthread_cond_init(pthread_cond_t *, >> - const pthread_condattr_t *); >> -int pthread_cond_signal(pthread_cond_t *); >> + const pthread_condattr_t *) __exported; >> +int pthread_cond_signal(pthread_cond_t *) __exported; >> int pthread_cond_timedwait(pthread_cond_t *, pthread_mutex_t *, >> - const struct timespec *); >> -int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *); >> + const struct timespec *) __exported; >> +int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *) >> __exported; >> int pthread_create(pthread_t *, const pthread_attr_t *, >> - void *(*) (void *), void *); >> -int pthread_detach(pthread_t); >> -int pthread_equal(pthread_t, pthread_t); >> + void *(*) (void *), void *) __exported; >> +int pthread_detach(pthread_t) __exported; >> +int pthread_equal(pthread_t, pthread_t) __exported; >> void pthread_exit(void *) __dead2; >> -void *pthread_getspecific(pthread_key_t); >> -int pthread_join(pthread_t, void **); >> -int pthread_key_create(pthread_key_t *, void (*) (void *)); >> -int pthread_key_delete(pthread_key_t); >> -int pthread_mutexattr_init(pthread_mutexattr_t *); >> -int pthread_mutexattr_destroy(pthread_mutexattr_t *); >> -int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *); >> -int pthread_mutexattr_settype(pthread_mutexattr_t *, int); >> -int pthread_mutex_destroy(pthread_mutex_t *); >> +void *pthread_getspecific(pthread_key_t) __exported; >> +int pthread_join(pthread_t, void **) __exported; >> +int pthread_key_create(pthread_key_t *, void (*) (void *)) >> __exported; >> +int pthread_key_delete(pthread_key_t) __exported; >> +int pthread_mutexattr_init(pthread_mutexattr_t *) __exported; >> +int pthread_mutexattr_destroy(pthread_mutexattr_t *) __exported; >> +int pthread_mutexattr_gettype(pthread_mutexattr_t *, int >> *) __exported; >> +int pthread_mutexattr_settype(pthread_mutexattr_t *, int) >> __exported; >> +int pthread_mutex_destroy(pthread_mutex_t *) __exported; >> int pthread_mutex_init(pthread_mutex_t *, >> - const pthread_mutexattr_t *); >> -int pthread_mutex_lock(pthread_mutex_t *); >> + const pthread_mutexattr_t *) __exported; >> +int pthread_mutex_lock(pthread_mutex_t *) __exported; >> int pthread_mutex_timedlock(pthread_mutex_t *, >> - const struct timespec *); >> -int pthread_mutex_trylock(pthread_mutex_t *); >> -int pthread_mutex_unlock(pthread_mutex_t *); >> -int pthread_once(pthread_once_t *, void (*) (void)); >> -int pthread_rwlock_destroy(pthread_rwlock_t *); >> + const struct timespec *) __exported; >> +int pthread_mutex_trylock(pthread_mutex_t *) __exported; >> +int pthread_mutex_unlock(pthread_mutex_t *) __exported; >> +int pthread_once(pthread_once_t *, void (*) (void)) __exported; >> +int pthread_rwlock_destroy(pthread_rwlock_t *) __exported; >> int pthread_rwlock_init(pthread_rwlock_t *, >> - const pthread_rwlockattr_t *); >> -int pthread_rwlock_rdlock(pthread_rwlock_t *); >> + const pthread_rwlockattr_t *) __exported; >> +int pthread_rwlock_rdlock(pthread_rwlock_t *) __exported; >> int pthread_rwlock_timedrdlock(pthread_rwlock_t *, >> - const struct timespec *); >> -int pthread_rwlock_tryrdlock(pthread_rwlock_t *); >> -int pthread_rwlock_trywrlock(pthread_rwlock_t *); >> -int pthread_rwlock_unlock(pthread_rwlock_t *); >> -int pthread_rwlock_wrlock(pthread_rwlock_t *); >> + const struct timespec *) __exported; >> +int pthread_rwlock_tryrdlock(pthread_rwlock_t *) __exported; >> +int pthread_rwlock_trywrlock(pthread_rwlock_t *) __exported; >> +int pthread_rwlock_unlock(pthread_rwlock_t *) __exported; >> +int pthread_rwlock_wrlock(pthread_rwlock_t *) __exported; >> int pthread_rwlock_timedwrlock(pthread_rwlock_t *, >> - const struct timespec *); >> -int pthread_rwlockattr_init(pthread_rwlockattr_t *); >> + const struct timespec *) __exported; >> +int pthread_rwlockattr_init(pthread_rwlockattr_t *) __exported; >> int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *, >> - int *); >> -int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int); >> -int pthread_rwlockattr_destroy(pthread_rwlockattr_t *); >> -pthread_t pthread_self(void); >> -int pthread_setspecific(pthread_key_t, const void *); >> + int *) __exported; >> +int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, >> int) __exported; >> +int pthread_rwlockattr_destroy(pthread_rwlockattr_t *) >> __exported; >> +pthread_t pthread_self(void) __exported; >> +int pthread_setspecific(pthread_key_t, const void *) __exported; >> >> -int pthread_spin_destroy(pthread_spinlock_t *); >> -int pthread_spin_init(pthread_spinlock_t *, int); >> -int pthread_spin_lock(pthread_spinlock_t *); >> -int pthread_spin_trylock(pthread_spinlock_t *); >> -int pthread_spin_unlock(pthread_spinlock_t *); >> +int pthread_spin_destroy(pthread_spinlock_t *) __exported; >> +int pthread_spin_init(pthread_spinlock_t *, int) __exported; >> +int pthread_spin_lock(pthread_spinlock_t *) __exported; >> +int pthread_spin_trylock(pthread_spinlock_t *) __exported; >> +int pthread_spin_unlock(pthread_spinlock_t *) __exported; >> >> -int pthread_cancel(pthread_t); >> -int pthread_setcancelstate(int, int *); >> -int pthread_setcanceltype(int, int *); >> -void pthread_testcancel(void); >> +int pthread_cancel(pthread_t) __exported; >> +int pthread_setcancelstate(int, int *) __exported; >> +int pthread_setcanceltype(int, int *) __exported; >> +void pthread_testcancel(void) __exported; >> >> -int pthread_getprio(pthread_t); >> -int pthread_setprio(pthread_t, int); >> -void pthread_yield(void); >> +int pthread_getprio(pthread_t) __exported; >> +int pthread_setprio(pthread_t, int) __exported; >> +void pthread_yield(void) __exported; >> >> -int pthread_mutexattr_getpshared(const pthread_mutexattr_t >> *, int *); >> -int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int); >> +int pthread_mutexattr_getpshared(const pthread_mutexattr_t >> *, int *) __exported; >> +int pthread_mutexattr_setpshared(pthread_mutexattr_t *, >> int) __exported; >> >> -int pthread_mutexattr_getprioceiling(pthread_mutexattr_t *, int >> *); >> -int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *, int); >> -int pthread_mutex_getprioceiling(pthread_mutex_t *, int *); >> -int pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *); >> +int pthread_mutexattr_getprioceiling(pthread_mutexattr_t >> *, int *) __exported; >> +int pthread_mutexattr_setprioceiling(pthread_mutexattr_t >> *, int) __exported; >> +int pthread_mutex_getprioceiling(pthread_mutex_t *, int *) >> __exported; >> +int pthread_mutex_setprioceiling(pthread_mutex_t *, int, >> int *) __exported; >> >> -int pthread_mutexattr_getprotocol(pthread_mutexattr_t *, int *); >> -int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int); >> +int pthread_mutexattr_getprotocol(pthread_mutexattr_t *, >> int *) __exported; >> +int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, >> int) __exported; >> >> -int pthread_attr_getinheritsched(const pthread_attr_t *, int *); >> +int pthread_attr_getinheritsched(const pthread_attr_t *, >> int *) __exported; >> int pthread_attr_getschedparam(const pthread_attr_t *, >> - struct sched_param *); >> -int pthread_attr_getschedpolicy(const pthread_attr_t *, int *); >> -int pthread_attr_getscope(const pthread_attr_t *, int *); >> -int pthread_attr_setinheritsched(pthread_attr_t *, int); >> + struct sched_param *) __exported; >> +int pthread_attr_getschedpolicy(const pthread_attr_t *, >> int *) __exported; >> +int pthread_attr_getscope(const pthread_attr_t *, int *) >> __exported; >> +int pthread_attr_setinheritsched(pthread_attr_t *, int) >> __exported; >> int pthread_attr_setschedparam(pthread_attr_t *, >> - const struct sched_param *); >> -int pthread_attr_setschedpolicy(pthread_attr_t *, int); >> -int pthread_attr_setscope(pthread_attr_t *, int); >> + const struct sched_param *) >> __exported; >> +int pthread_attr_setschedpolicy(pthread_attr_t *, int) >> __exported; >> +int pthread_attr_setscope(pthread_attr_t *, int) __exported; >> int pthread_getschedparam(pthread_t pthread, int *, >> - struct sched_param *); >> + struct sched_param *) __exported; >> int pthread_setschedparam(pthread_t, int, >> - const struct sched_param *); >> -int pthread_getconcurrency(void); >> -int pthread_setconcurrency(int); >> + const struct sched_param *) __exported; >> +int pthread_getconcurrency(void) __exported; >> +int pthread_setconcurrency(int) __exported; >> >> -int pthread_attr_setfloatstate(pthread_attr_t *, int); >> -int pthread_attr_getfloatstate(pthread_attr_t *, int *); >> +int pthread_attr_setfloatstate(pthread_attr_t *, int) __exported; >> +int pthread_attr_getfloatstate(pthread_attr_t *, int *) >> __exported; >> __END_DECLS >> >> #endif >> >> >>> On 24 August 2011 13:46, Siju George <sgeorge...@gmail.com> wrote: >>>> Hi, >>>> >>>> I get this compiling firefox from pkgsrc-2011Q2 0n >>>> v2.11.0.586.ga700a-DEVELOPMENT :-( >>>> >>>> >>>> c++ -o jsnativestack.o -c -I./../../dist/system_wrappers_js -include >>>> ./config/gcc_hidden.h -DOSTYPE=\"DragonFly2.11-DEVELOPMENT\" >>>> -DOSARCH=DragonFly -DEXPORT_JS_API -D__STDC_LIMIT_MACROS >>>> -DJS_HAS_CTYPES -DDLL_PREFIX=\"lib\" -DDLL_SUFFIX=\".so\" >>>> -Ictypes/libffi/include -I. -I. -I. -I./../../dist/include >>>> -I./../../dist/include/nsprpub >>>> -I/usr/pkgsrc/devel/xulrunner/work/mozilla-2.0/dist/include/nspr -I. >>>> -I./assembler -I./yarr -fPIC -I/usr/include -I/usr/pkg/include >>>> -I/usr/pkg/include/freetype2 -fno-rtti -fno-exceptions -Wall >>>> -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy >>>> -Wno-non-virtual-dtor -Wcast-align -Wno-invalid-offsetof >>>> -Wno-variadic-macros -Werror=return-type -I/usr/include >>>> -I/usr/pkg/include -I/usr/pkg/include/freetype2 -fno-strict-aliasing >>>> -pthread -pipe -DNDEBUG -DTRIMMED -O2 -DUSE_SYSTEM_MALLOC=1 >>>> -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -I/usr/include -I/usr/pkg/include >>>> -I/usr/pkg/include/freetype2 -DMOZILLA_CLIENT -include ./js-confdefs.h >>>> -MD -MF .deps/jsnativestack.pp jsnativestack.cpp >>>> jsnativestack.cpp: In function 'void* js::GetNativeStackBaseImpl()': >>>> jsnativestack.cpp:207: error: 'pthread_getattr_np' was not declared in >>>> this scope >>>> gmake[3]: *** [jsnativestack.o] Error 1 >>>> gmake[3]: Leaving directory >>>> `/usr/pkgsrc/devel/xulrunner/work/mozilla-2.0/js/src' >>>> gmake[2]: *** [libs_tier_js] Error 2 >>>> gmake[2]: Leaving directory `/usr/pkgsrc/devel/xulrunner/work/mozilla-2.0' >>>> gmake[1]: *** [tier_js] Error 2 >>>> gmake[1]: Leaving directory `/usr/pkgsrc/devel/xulrunner/work/mozilla-2.0' >>>> gmake: *** [all] Error 2 >>>> *** Error code 2 >>>> >>>> Stop. >>>> bmake: stopped in /usr/pkgsrc/devel/xulrunner >>>> *** Error code 1 >>>> >>>> Stop. >>>> bmake: stopped in /usr/pkgsrc/devel/xulrunner >>>> *** Error code 1 >>>> >>>> Stop. >>>> bmake: stopped in /usr/pkgsrc/www/firefox >>>> *** Error code 1 >>>> >>>> Stop. >>>> bmake: stopped in /usr/pkgsrc/www/firefox >>>> You have new mail. >>>> blk-build# >>>> >>>> Thanks >>>> >>>> --Siju >>>> >>>
