Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix various win32 compile issues #9915

Merged
merged 5 commits into from
Feb 4, 2020
Merged

Fix various win32 compile issues #9915

merged 5 commits into from
Feb 4, 2020

Commits on Feb 3, 2020

  1. Correct libevent 2.2-dev lib list 

    In libevent 2.2 dev, libevent is sliced into base, _core and _extra
libraries. libevent_pthreads on gcc exhibits a dependency on the
libevent_core lib. The resulting error prior to this patch is;

ERROR: /home/pivotal/workspace/envoy/test/common/http/BUILD:109:1:
Linking of rule '//test/common/http:codes_speed_test' failed (Exit 1)
gcc failed: error executing command /usr/bin/gcc
@bazel-out/k8-fastbuild/bin/test/common/http/codes_speed_test-2.params
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_posix_lock_alloc: error: undefined reference to 'event_mm_malloc_'
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_posix_lock_alloc: error: undefined reference to 'event_mm_free_'
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_posix_lock_free: error: undefined reference to 'event_mm_free_'
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_posix_cond_alloc: error: undefined reference to 'event_mm_malloc_'
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_posix_cond_alloc: error: undefined reference to 'event_mm_free_'
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_posix_cond_free: error: undefined reference to 'event_mm_free_'
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_use_pthreads: error: undefined reference to 'evthread_set_lock_callbacks'
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_use_pthreads: error: undefined reference to 'evthread_set_condition_callbacks'
bazel/foreign_cc/event/lib/libevent_pthreads.a(evthread_pthread.c.o):evthread_pthread.c:function
evthread_use_pthreads: error: undefined reference to 'evthread_set_id_callback'
collect2: error: ld returned 1 exit status

On Windows, including event_extra.lib was excessive/unnecessary.

Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe
    wrowe committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    9dffdba View commit details
    Browse the repository at this point in the history

  2. Corrections to commit 6799eec 

    Adjust 6799eec
to behave on windows (.begin() returns an iterator, we need the uint8[] bytestream from .data())

Also correct the spelling to generateHashForSessionContextId

Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe
    wrowe committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    7759c93 View commit details
    Browse the repository at this point in the history

  3. Correct DirectoryWithBrokenSymlink test for win32 

    As commented, a previously valid directory symlink acts very
differently between the linux and win32 filesystems.

Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe
    wrowe committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    a526ac8 View commit details
    Browse the repository at this point in the history

  4. Fix win32 breakage of size_t zero value 

    On Windows we need to cooerce this value to 64 bits.

Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe
    wrowe committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    d3baf48 View commit details
    Browse the repository at this point in the history

  5. Fix formatting, spelling, and casting 

    Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe
    wrowe committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    3faaf9a View commit details
    Browse the repository at this point in the history